Several fixes in CustomSchemaLinks.