Project makefiles fixed