Fixed more makefiles