Fix some security vulnerabilities