MinGW32 fixes by Sandro Furieri