Fix some issues with the registry json