Fix RegistryUtils