Some minor simulator change