Fixed some out-of-date things in Makefile