Further build.xml modifications