Changed Makefiles