Tweaks to CSD