Makefile updates
More makefile changes
How was this even working?