Fix up a few lint issues