More Fixes to build.xml