Minor changes to models.