Admin fixes, and more perms