More fixes for building on Windows.