Lint warnings fixed.