Fixes for security vulnerabilities