Fix build.xml slightly, needs to be largely redone.