More fixes for mingw32
More fixups for mingw32