Race numbers fixes