More changes to get things working on Lupus Baileyi (Cygwin).