Minor fixes to schemas and rest_admin_api.