build.xml fixes