Minor code updates for DSC