Some improvements in Makefiles