fixes for security issues