Fixes for the simulator