Lint fixes for Window on mac