Updated Makefiles as pointed out in #400