added windows fixes