Couple more fixes to CtoD Table