Various windows fixes