Updated Makefiles