Finish up makefile hacks