Minor improvements on Window.