Remove Lint warnings