Small tweaks to the CFP