More Makefile changes

This'll hopefully fix it.