Minor fixes to updated the Makefiles