Fixes to join, race registration