Minor bugfixes/adjustments for new models.