MSYS2 64bit related fixes