Fixes to TPCC