Misc tweaks for racetrack.