Again windows fixes