Some more fixing in StructureRegistry.