fixes for new ncrpc