Fix to build and Ant support.