Fixes to model translation