diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h
index 3c807843..83fa75db 100644
--- a/include/gtest/internal/gtest-port.h
+++ b/include/gtest/internal/gtest-port.h
@@ -1410,7 +1410,7 @@ const ::std::vector<testing::internal::string>& GetInjectableArgvs();
 void SetInjectableArgvs(const ::std::vector<testing::internal::string>*
                              new_argvs);
 
-// A copy of all command line arguments.  Set by InitGoogleTest().
+// A copy of all command line arguments.  Set by ParseGTestFlags().
 extern ::std::vector<testing::internal::string> g_argvs;
 
 #endif  // GTEST_HAS_DEATH_TEST
diff --git a/test/gtest_unittest.cc b/test/gtest_unittest.cc
index 774fa833..8f8abb35 100644
--- a/test/gtest_unittest.cc
+++ b/test/gtest_unittest.cc
@@ -6333,7 +6333,7 @@ TEST_F(InitGoogleTestTest, WideStrings) {
 
   GTEST_TEST_PARSING_FLAGS_(argv, argv2, expected_flags, false);
 }
-#endif  // GTEST_OS_WINDOWS
+# endif  // GTEST_OS_WINDOWS
 
 // Tests current_test_info() in UnitTest.
 class CurrentTestInfoTest : public Test {