Final model tweaks