Minor changes to simulator.