Minor changes to submodels