Various windows corrections.
Minor tweak.