Fix XML Builder