Fix CC and NRPN...