Simulation Fixes.