Minor bugfixes related to nrDof -> nrDof-6