Adjust Makefiles