Updates on makefiles