Adjusted Makefiles