Fix up makefile