Fixed issue #2280: Add Msys2 workarounds