A few twiddles to get cygwin working-ish again