Small fixes on XML classes