Fix remaining linter errors