diff --git a/contrib/pagehack/pagehack.cpp b/contrib/pagehack/pagehack.cpp
index 0ffc38ac827e667c06061b61367dddfec6bfbeb4..d9058366e2c15b5b02804a4ef482beaf89828749 100644
--- a/contrib/pagehack/pagehack.cpp
+++ b/contrib/pagehack/pagehack.cpp
@@ -5750,8 +5750,9 @@ int main(int argc, char** argv)
         exit(1);
     }
 
-    if (enable_dss && socketpath == NULL) {
-        fprintf(stderr, "Socketpath cannot be NULL when enable dss.\n");
+    if (enable_dss && (socketpath == NULL || strlen(socketpath) == 0 || strncmp("UDS:", socketpath, 4) != 0)) {
+        fprintf(stderr, "Socketpath must be specific correctly when enable dss, "
+            "format is: '-c UDS:xxx'.\n");
         exit(1);
     }
 
diff --git a/contrib/pg_xlogdump/pg_xlogdump.cpp b/contrib/pg_xlogdump/pg_xlogdump.cpp
index 4885fff5c28475cb7c8ede46bd73491f7f3e1134..723db46a10718f07d86df9fe9f72a9bde4f4c1ac 100644
--- a/contrib/pg_xlogdump/pg_xlogdump.cpp
+++ b/contrib/pg_xlogdump/pg_xlogdump.cpp
@@ -1012,8 +1012,10 @@ int main(int argc, char** argv)
     }
 
     if (dumpprivate.enable_dss) {
-        if (dumpprivate.socketpath == NULL) {
-            fprintf(stderr, "%s: socketpath cannot be NULL when enable dss\n", progname);
+        if (dumpprivate.socketpath == NULL || strlen(dumpprivate.socketpath) == 0 ||
+            strncmp("UDS:", dumpprivate.socketpath, 4) != 0) {
+            fprintf(stderr, "%s: socketpath must be specific correctly when enable dss, "
+                "format is: '--socketpath=\"UDS:xxx\"'.\n", progname);
             goto bad_argument;
         }
 
diff --git a/src/bin/pg_controldata/pg_controldata.cpp b/src/bin/pg_controldata/pg_controldata.cpp
index 328d76f7ca3991a67755cd2a1790421f4705778c..845d552c7e849561eaee3e251abe121e0ec371ca 100644
--- a/src/bin/pg_controldata/pg_controldata.cpp
+++ b/src/bin/pg_controldata/pg_controldata.cpp
@@ -327,8 +327,9 @@ int main(int argc, char* argv[])
     check_env_value_c(DataDir);
 
     if (enable_dss) {
-        if (socketpath == NULL) {
-            fprintf(stderr, _("%s: socketpath cannot be NULL when enable dss\n"), progname);
+        if (socketpath == NULL || strlen(socketpath) == 0 || strncmp("UDS:", socketpath, 4) != 0) {
+            fprintf(stderr, _("%s: socketpath must be specific correctly when enable dss, "
+                "format is: '--socketpath=\"UDS:xxx\"'.\n"), progname);
             exit_safely(1);
         }
 
diff --git a/src/bin/pg_probackup/pg_probackup.cpp b/src/bin/pg_probackup/pg_probackup.cpp
index 85045453a9eff318a4fc22867dbe1b9f50d211f6..f0275344cfcf514d7a485584e462782541b41192 100644
--- a/src/bin/pg_probackup/pg_probackup.cpp
+++ b/src/bin/pg_probackup/pg_probackup.cpp
@@ -949,6 +949,10 @@ static void dss_init(void)
             elog(ERROR, "Remote operations on dss mode are not supported");
         }
 
+        if (instance_config.dss.vgname == NULL) {
+            elog(ERROR, "Vgname must be specified in dss mode.");
+        }
+
         parse_vgname_args(instance_config.dss.vgname);
 
         /* Check dss connect */
diff --git a/src/bin/pg_resetxlog/pg_resetxlog.cpp b/src/bin/pg_resetxlog/pg_resetxlog.cpp
index b13c62ed82d3e9aaaed4dd2d0e388e2ca68e3e62..9b7d27fa2b025ed393688328e036ffa7f842df44 100644
--- a/src/bin/pg_resetxlog/pg_resetxlog.cpp
+++ b/src/bin/pg_resetxlog/pg_resetxlog.cpp
@@ -276,8 +276,9 @@ int main(int argc, char* argv[])
     }
 
     if (dss.enable_dss) {
-        if (dss.socketpath == NULL) {
-            fprintf(stderr, _("%s: socketpath cannot be NULL when enable dss\n"), progname);
+        if (dss.socketpath == NULL || strlen(dss.socketpath) == 0 || strncmp("UDS:", dss.socketpath, 4) != 0) {
+            fprintf(stderr, _("%s: socketpath must be specific correctly when enable dss, "
+                "format is: '--socketpath=\"UDS:xxx\"'.\n"), progname);
             exit(1);
         }
         if (dss.vgname == NULL) {
diff --git a/src/common/backend/utils/misc/guc/guc_network.cpp b/src/common/backend/utils/misc/guc/guc_network.cpp
index a0dced21dc9bfc854c6c2f4fb73db198eb5ec31a..2d3475e89cc7695a78fed3db80b900236753228c 100755
--- a/src/common/backend/utils/misc/guc/guc_network.cpp
+++ b/src/common/backend/utils/misc/guc/guc_network.cpp
@@ -1100,7 +1100,7 @@ static bool check_maxconnections(int* newval, void** extra, GucSource source)
 
 #ifdef PGXC
     if (IS_PGXC_COORDINATOR && *newval > MAX_BACKENDS) {
-        ereport(LOG, (errmsg("PGXC can't support max_connections more than %d.", MAX_BACKENDS)));
+        GUC_check_errmsg("PGXC can't support max_connections more than %d.", MAX_BACKENDS);
         return false;
     }
 #endif
@@ -1111,7 +1111,7 @@ static bool check_maxconnections(int* newval, void** extra, GucSource source)
     }
 
     if (g_instance.attr.attr_storage.dms_attr.enable_dms && *newval > DMS_MAX_CONNECTIONS) {
-        ereport(LOG, (errmsg("Shared Storage can't support max_connections more than %d.", DMS_MAX_CONNECTIONS)));
+        GUC_check_errmsg("Shared Storage can't support max_connections more than %d.", DMS_MAX_CONNECTIONS);
         return false;
     }
     return true;
diff --git a/src/common/backend/utils/misc/postgresql_single.conf.sample b/src/common/backend/utils/misc/postgresql_single.conf.sample
index ffe049cce44c5700496671817d2812631d15b024..278ae73e275f983f0cfaa2ad908e836f0bab78ab 100644
--- a/src/common/backend/utils/misc/postgresql_single.conf.sample
+++ b/src/common/backend/utils/misc/postgresql_single.conf.sample
@@ -822,7 +822,6 @@ job_queue_processes = 10        # Number of concurrent jobs, optional: [0..1000]
 #------------------------------------------------------------------------------
 #ss_enable_dms = off
 #ss_enable_dss = off
-#ss_enable_reform = on
 #ss_enable_ssl = on
 #ss_enable_aio = on
 #ss_enable_catalog_centralized = on