Minor fixes for new CP stuff