User API fixes and minor improvements