Build.xml improvements