Fixed makefiles