Makefile changes and stuff