Fixed up the Makefiles