Preparation of loading XML.

Only minor changes.