Fix some new lint warnings.