Fixup some lint warnings