Fix up Makefile