Exploratory fixes to deal with new model.