Fixes allowing ant-compat builds