Changes made for cygwin environment