Small changes to build, makefile, test