And fix build.xml