Fix lint error.
More lint warnings.
Make the reference const.