Minor fixes related to the models.