Some more model fixes