Fixes for security issues