Minor cps changes