Simulator Fixes.