Further model tweaks