Changes on makefiles