more um840.xml fixes.