more window position saving fixes