Fix Linter errors