Some fixes for MSYS2.