Windows-only fixes for moving concurrent out of base