Minor updates to Window.