Lint, scope fixes.