Corrected makefiles