Fixes to make openModel possible