Update some files
Update to use apache-xml 4.3_r2.1