applied some EBI XML specific hacks