Some fixes to generic XML editor