Bug fixes around PN re-registration