Small fixes to MP CN