Fixing makefiles, again