More tweaks to the race controller