some windows fixes for previous commit