Address security vulnerabilities (fix 2)