Other fixes for the registry