Some Makefile improvements