Hotfixes for ant build.