Tweaks to user model