Update the CFP + a few fixes