Fixing a couple issues with race / class selection.