Minor touchups from the registry object revert