Fix multiple minor security vulnerabilities