Improved WindowBase a little.