Updates to Makefile and javasetup