Improve ant build