Simulation Fixes