Fix minor build errors, and rename the dumpId argument of butc's