Quick tweaks for XML parsing