Fixed a couple of minor issues in stock component maintenance related to flattening the XML.