Fixup Makefile again