Fixes for "build.xml"