Forge Modifications to avoid JAXP craziness