cleanup some windows errata