Fixing Lint warnings