fix a couple races