more xml strip fixes