A couple of simulation fixes

Fixed a couple of issues reported in the KER thread.

Will submit equivalent pull to 1.0 repo shortly...