Fix up and add missing xml