Fix a few lint warnings