Some fixes, added RBAC