Minor updates for schema extraction and intra-linking.

Minor updates for schema extraction and intra-linking.