Fixes allowing ant-compat builds and running of this old code