some more racemode fixes