Tweaks to build.xml