Fix model changes...