Minor tweaks to models.