Fix Lint errors