more model fixes