Lint-related changes