Fixes to models