fixups to remove old registration and fixups for minor metadata bug