Minor improvements to simulation mode