multiple fixes to ddi editor