Some model tweaks