- fixes to SAX parser