Small updates to User model.