Couple of improvements to the Ant build