fix more data races