Simulation fixes.