makefiles fixes