Windows bug fixes, support for -F switch