Bugs

Security Issues (minor)