more race fixes