Fixes to running a model inside a proposal