Build.xml fixes