Changes to fix on Cygwin x86_64.