Further tweaks to the models