Tweaks to User model