Minor changes in registry.go