User model tweaks