Simulator minor fixes