Made changes to makefiles