diff --git a/nshlib/nsh_command.c b/nshlib/nsh_command.c
index 0256fe2ac..d15b15a2c 100644
--- a/nshlib/nsh_command.c
+++ b/nshlib/nsh_command.c
@@ -886,7 +886,7 @@ static inline void help_builtins(FAR struct nsh_vtbl_s *vtbl)
 
   char line[HELP_LINELEN + HELP_TABSIZE + 1];
 
-  static const char *g_builtin_prompt = "\nBuiltin Apps:\n";
+  static FAR const char *const g_builtin_prompt = "\nBuiltin Apps:\n";
 
   /* Count the number of built-in commands and get the optimal column width */
 
diff --git a/nshlib/nsh_script.c b/nshlib/nsh_script.c
index e9a89af5b..9cf19fd25 100644
--- a/nshlib/nsh_script.c
+++ b/nshlib/nsh_script.c
@@ -35,6 +35,14 @@
 
 #ifndef CONFIG_NSH_DISABLESCRIPT
 
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+#ifdef CONFIG_ETC_ROMFS
+static bool g_nsh_script_initialized;
+#endif
+
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -227,15 +235,14 @@ int nsh_sysinitscript(FAR struct nsh_vtbl_s *vtbl)
 #ifdef CONFIG_ETC_ROMFS
 int nsh_initscript(FAR struct nsh_vtbl_s *vtbl)
 {
-  static bool initialized;
   bool already;
   int ret = OK;
 
-  /* Atomic test and set of the initialized flag */
+  /* Atomic test and set of the g_nsh_script_initialized flag */
 
   sched_lock();
-  already     = initialized;
-  initialized = true;
+  already                  = g_nsh_script_initialized;
+  g_nsh_script_initialized = true;
   sched_unlock();
 
   /* If we have not already executed the init script, then do so now */