some racemode fixes