windows fixes for prior commit