Hotfix permission / security issues