Minor changes to makefiles