Lint warnings fixed