Changes to make things work with user-api-client and, subsequently, user-api