Fixes to model