more Makefile fixes