Fix up errors introduced when working on registration