Fix a couple minor things to pass lint.