Fix a few lint errors