Pulling some changes from rnp-institution to minimize differences