Simulator Minor Changes