A couple of simulation fixes

Fixed a couple of issues reported in the KER thread.