Tweaks to CC-2