Fix XML structure on some elements