Fixing roles security issues