Minor changes to User model