Fixing Makefiles