Fixes up models