C2D Table Fixes