a few more tweaks for CompositeModel