Some more fixes to the CP patches