diff --git a/modules/es/fsw/src/cfe_es_verify.h b/modules/es/fsw/src/cfe_es_verify.h
index d8895ba26..4cffb95f4 100644
--- a/modules/es/fsw/src/cfe_es_verify.h
+++ b/modules/es/fsw/src/cfe_es_verify.h
@@ -118,12 +118,21 @@
 #endif
 
 /*
-** SysLog mode
+** Default System Log Mode following Power On Reset
 */
-#if CFE_PLATFORM_ES_DEFAULT_SYSLOG_MODE < 0
-#error CFE_PLATFORM_ES_DEFAULT_SYSLOG_MODE cannot be less than 0!
-#elif CFE_PLATFORM_ES_DEFAULT_SYSLOG_MODE > 1
-#error CFE_PLATFORM_ES_DEFAULT_SYSLOG_MODE cannot be greater than 1!
+#if CFE_PLATFORM_ES_DEFAULT_POR_SYSLOG_MODE < 0
+#error CFE_PLATFORM_ES_DEFAULT_POR_SYSLOG_MODE cannot be less than 0!
+#elif CFE_PLATFORM_ES_DEFAULT_POR_SYSLOG_MODE > 1
+#error CFE_PLATFORM_ES_DEFAULT_POR_SYSLOG_MODE cannot be greater than 1!
+#endif
+
+/*
+** Default System Log Mode following Processor Reset
+*/
+#if CFE_PLATFORM_ES_DEFAULT_PR_SYSLOG_MODE < 0
+#error CFE_PLATFORM_ES_DEFAULT_PR_SYSLOG_MODE cannot be less than 0!
+#elif CFE_PLATFORM_ES_DEFAULT_PR_SYSLOG_MODE > 1
+#error CFE_PLATFORM_ES_DEFAULT_PR_SYSLOG_MODE cannot be greater than 1!
 #endif
 
 /*
diff --git a/modules/tbl/config/default_cfe_tbl_internal_cfg.h b/modules/tbl/config/default_cfe_tbl_internal_cfg.h
index 412553139..8857547f0 100644
--- a/modules/tbl/config/default_cfe_tbl_internal_cfg.h
+++ b/modules/tbl/config/default_cfe_tbl_internal_cfg.h
@@ -125,7 +125,7 @@
 **       This number must be less than 32767.  It should be recognized that this parameter
 **       determines the size of the Critical Table Registry which is maintained in the Critical
 **       Data Store.  An excessively high number will waste Critical Data Store memory.  Therefore,
-**       this number must not exceed the value defined in CFE_ES_CDS_MAX_CRITICAL_TABLES.
+**       this number must not exceed the value defined in CFE_PLATFORM_ES_CDS_MAX_NUM_ENTRIES.
 */
 #define CFE_PLATFORM_TBL_MAX_CRITICAL_TABLES 32