Minor fixes to makefiles