Additional fixes for hangs on Windows x64