some fixes
Merge branch 'mingw-w64-builds' of github.com:niXman/mingw-builds into mingw-w64-builds