More Cygwin compatibility fixes

2 jobs for master in 7 minutes and 31 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #151635300
test

00:05:39

 
  Nutshell
passed #151635301
nutshell

00:01:52