Makefile updates