add some windows fixes