Lots of window fixes from FNA