More lint fixups