Some changes in Makefiles