Updated Makefiles with minor changes