Better windows fixes