Fixed build xml some more