Improvements to window.