misc Makefile adjustments