Fix makefiles