diff --git a/tools/gn/file_template.h b/tools/gn/file_template.h
index ddbd67f..2071336 100644
--- a/tools/gn/file_template.h
+++ b/tools/gn/file_template.h
@@ -129,8 +129,9 @@
   static const char* GetNinjaVariableNameForType(Subrange::Type type);
 
   // Extracts the given type of substitution from the given source file.
-  // If output_style is RELATIVE, relative_to indicates the directory that the
-  // relative directories should be relative to, otherwise it is ignored.
+  // If output_style is OUTPUT_RELATIVE, relative_to indicates the directory
+  // that the relative directories should be relative to, otherwise it is
+  // ignored.
   static std::string GetSubstitution(const Settings* settings,
                                      const SourceFile& source,
                                      Subrange::Type type,
diff --git a/tools/gn/filesystem_utils.cc b/tools/gn/filesystem_utils.cc
index 17fec9f..097a227 100644
--- a/tools/gn/filesystem_utils.cc
+++ b/tools/gn/filesystem_utils.cc
@@ -340,7 +340,7 @@
   // This check will be wrong for all proper prefixes "e.g. "/output" will
   // match "/out" but we don't really care since this is just a sanity check.
   const std::string& dir_str = dir.value();
-  if (str.compare(0, dir_str.length(), dir_str, 0, dir_str.length()) == 0)
+  if (str.compare(0, dir_str.length(), dir_str) == 0)
     return true;  // Output directory is hardcoded.
 
   if (allow_templates) {
diff --git a/tools/gn/target_generator.cc b/tools/gn/target_generator.cc
index d38dbd9..12d09fc 100644
--- a/tools/gn/target_generator.cc
+++ b/tools/gn/target_generator.cc
@@ -163,10 +163,10 @@
 void TargetGenerator::FillInputs() {
   const Value* value = scope_->GetValue(variables::kInputs, true);
   if (!value) {
-    // Older versions used "inputs". Allow use of this variable until
+    // Older versions used "source_prereqs". Allow use of this variable until
     // all callers are updated.
     // TODO(brettw) remove this eventually.
-    value = scope_->GetValue("inputs", true);
+    value = scope_->GetValue("source_prereqs", true);
 
     if (!value)
       return;