Fixing security issues