FIX bug XML & others