- Fixing some Lint warnings