More build.xml fixes