makefiles fixed