racemode fixes