build xml fixes