More ant buildscript fixes