Large windows fixes