Everything should work now
Makefile changes