More MINGW32 build fixes