Minor changes to ds_composite