More tweaks to build.xml

Today's been busy!