Tweaks for simulation mode