Fixed up makefile bugs