Some minor model changes