Fixed few Lint warnings