Makefiles fixed