Fix various problems with new CDT property extension