Preliminary model fixes