Fixes for users api