Fix some XML features