Makefile improvements