Race Registration Fixes