Safeguard badly behaved XML method
Fix DataFlavor ClassLoader issue