Fixed some security issues.
Fixed more security flaws