Fix-makefiles
