Minor tweaks to fix CYGWIN compilation