Defect DSC-269

Remaining small changes to fix defect.