Improve JAXP implementation compatibility