Fixed up the makefiles