makefile, minor fixes