More CCS tweaks