Fixed Lint issues.
Fixed more Lint issues.
More Lint fixes.