Some administration/authorization fixes