More fixes to Ant build