Catmandu fixes for processing XML