fixes to build.xml and Makefile