comply Lint warnings