Fix Makefiles