Numerous windows fixes

<no longer true>