Revert back the build.proj change, and change two others according to comments