diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index e384690d94a..339c3937180 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -1070,7 +1070,7 @@ help(const char *progname)
 	printf(_("  --no-subscriptions           do not dump subscriptions\n"));
 	printf(_("  --no-synchronized-snapshots  do not use synchronized snapshots in parallel jobs\n"));
 	printf(_("  --no-tablespaces             do not dump tablespace assignments\n"));
-	printf(_("  --no-toast-compression       do not dump toast compression methods\n"));
+	printf(_("  --no-toast-compression       do not dump TOAST compression methods\n"));
 	printf(_("  --no-unlogged-table-data     do not dump unlogged table data\n"));
 	printf(_("  --on-conflict-do-nothing     add ON CONFLICT DO NOTHING to INSERT commands\n"));
 	printf(_("  --quote-all-identifiers      quote all identifiers, even if not key words\n"));
@@ -16758,7 +16758,7 @@ dumpIndex(Archive *fout, const IndxInfo *indxinfo)
 			if (!parsePGArray(indstatvals, &indstatvalsarray, &nstatvals))
 				fatal("could not parse index statistic values");
 			if (nstatcols != nstatvals)
-				fatal("mismatched number of columns and values for index stats");
+				fatal("mismatched number of columns and values for index statistics");
 
 			for (j = 0; j < nstatcols; j++)
 			{
diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
index 5157f59cf79..2ac4910778b 100644
--- a/src/bin/pg_rewind/pg_rewind.c
+++ b/src/bin/pg_rewind/pg_rewind.c
@@ -561,7 +561,7 @@ perform_rewind(filemap_t *filemap, rewind_source *source,
 				break;
 
 			case FILE_ACTION_UNDECIDED:
-				pg_fatal("no action decided for \"%s\"", entry->path);
+				pg_fatal("no action decided for file \"%s\"", entry->path);
 				break;
 		}
 	}
diff --git a/src/interfaces/ecpg/preproc/ecpg.trailer b/src/interfaces/ecpg/preproc/ecpg.trailer
index 3600d7c6054..96c55349e82 100644
--- a/src/interfaces/ecpg/preproc/ecpg.trailer
+++ b/src/interfaces/ecpg/preproc/ecpg.trailer
@@ -302,7 +302,7 @@ ECPGDeclareStmt: DECLARE prepared_name STATEMENT
 				if (strcmp($2, ptr->name) == 0)
 				{
 					/* re-definition is not allowed */
-					mmerror(PARSE_ERROR, ET_ERROR, "declared name %s is already defined", ptr->name);
+					mmerror(PARSE_ERROR, ET_ERROR, "name \"%s\" is already declared", ptr->name);
 				}
 			}