Lint fixes for Window