diff --git a/Source/build.h b/Source/build.h
index d807944c..aec7b143 100644
--- a/Source/build.h
+++ b/Source/build.h
@@ -171,7 +171,7 @@ class DiagState {
   template<class C, class K, class V> void insert_or_assign(C&c, const K&k, V val)
   {
     typename C::value_type item(k, val);
-    std::pair<typename C::iterator, bool> ret = c.insert(item);
+    std::pair<C::iterator, bool> ret = c.insert(item);
     if (!ret.second) ret.first->second = val;
   }
   template<class C, class K> typename mapped_type_helper<C>::type get_paired_value(const C&c, const K&k, typename mapped_type_helper<C>::type defval) const
diff --git a/Source/util.cpp b/Source/util.cpp
index 2db03ef9..14fcb344 100644
--- a/Source/util.cpp
+++ b/Source/util.cpp
@@ -1021,7 +1021,7 @@ int RunChildProcessRedirected(LPCWSTR cmdprefix, LPCWSTR cmdmain, bool ForceUTF8
   DWORD childec = -1;
   if (ok)
   {
-    bool utf8 = CP_UTF8 == cp, okt;
+    bool fullbuf = false, utf8 = CP_UTF8 == cp, okt;
     char iobuf[512];
     DWORD cbRead, cbOfs = 0, cchwb = 0;
     WCHAR wbuf[100], wchbuf[2+1]; // A surrogate pair + \0
@@ -1067,7 +1067,7 @@ switchcp:   cp = orgwinconoutcp, mbtwcf = 0, utf8 = false;
         if (!cch) continue;
         wbuf[cchwb++] = wchbuf[0];
         if (--cch) wbuf[cchwb++] = wchbuf[1];
-        const bool fullbuf = cchwb+cch >= COUNTOF(wbuf)-1; // cch is 1 for surrogate pairs
+        fullbuf = cchwb+cch >= COUNTOF(wbuf)-1; // cch is 1 for surrogate pairs
         if (!okr || fullbuf || L'\n' == wchbuf[0]) // Stop on \n so \r\n conversion has enough context (...\r\n vs ...\n)
         { finalwrite:
 #ifdef MAKENSIS
@@ -1082,7 +1082,7 @@ switchcp:   cp = orgwinconoutcp, mbtwcf = 0, utf8 = false;
       }
       if (!okr)
       {
-        if (cchwb) goto finalwrite;
+        if (cchwb) goto finalwrite; // End of stream without a ending newline, write out the remaining data.
         break;
       }
     }