Fixes for build.xml