Minors changes to build.xml