XmlBuilder fixes + setting entrepot