...and more changes to build.xml