Windows build fixes with new mingw