Fixed xmlparse issues