Makefile changes to get things building