xml parser minor fixes