Simulation fixes