[US5975] minor fixes to ComplexTypes