Distr Two CP tweaks