more of the registrar's fixes