more window fixes