Resolve of some lint warnings.