Fixed cygwin and mingw cases