Changes to build in MinGW64 environment