Fixing more admin permissions, clean up, use helper methods