handled some Lint warnings.