Making corrections for 2.7 compatibility (which mostly means bypassing the xml parser...