Final commit, build.xml fixed