Fixing some Lint warnings