More fixes to end-to-end TPCC.