Correcting some bugs on experimental Makefiles