Fixing admin control, access control