minor fixes to the Model package