more generification tweaks for cygwin to linux-gnu