XML exporter bug fixes