Fix errors from the rddtable merge.