Some changes to makefiles