fix few more races