diff --git a/command.c b/command.c
index 0e12d45f59..61ade1a973 100644
--- a/command.c
+++ b/command.c
@@ -599,7 +599,7 @@ static bool verify_command(const char *cmd)
    if (command_get_arg(cmd, NULL, NULL))
       return true;
 
-   RARCH_ERR("Command \"%s\" is not recognized by RetroArch.\n", cmd);
+   RARCH_ERR("Command \"%s\" is not recognized by the program.\n", cmd);
    RARCH_ERR("\tValid commands:\n");
    for (i = 0; i < sizeof(map) / sizeof(map[0]); i++)
       RARCH_ERR("\t\t%s\n", map[i].str);
diff --git a/command_event.c b/command_event.c
index 51c2a7f32a..f2f351cdf0 100644
--- a/command_event.c
+++ b/command_event.c
@@ -982,7 +982,7 @@ static bool event_update_system_info(struct retro_system_info *_info,
  * event_command:
  * @cmd                  : Event command index.
  *
- * Performs RetroArch event command with index @cmd.
+ * Performs program event command with index @cmd.
  *
  * Returns: true (1) on success, otherwise false (0).
  **/
diff --git a/retroarch.c b/retroarch.c
index 6a2b04a45f..931841fbfc 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -163,7 +163,7 @@ static void print_version(void)
 /**
  * print_help:
  *
- * Prints help message explaining RetroArch's commandline switches.
+ * Prints help message explaining the program's commandline switches.
  **/
 static void print_help(const char *arg0)
 {
@@ -494,7 +494,7 @@ enum rarch_content_type rarch_path_is_media_type(const char *path)
  * @argc                 : Count of (commandline) arguments.
  * @argv                 : (Commandline) arguments.
  *
- * Parses (commandline) arguments passed to RetroArch.
+ * Parses (commandline) arguments passed to program.
  *
  **/
 static void parse_input(int argc, char *argv[])
@@ -1078,7 +1078,7 @@ void rarch_main_alloc(void)
  * rarch_main_new:
  *
  * Will teardown drivers and clears all 
- * internal state of RetroArch.
+ * internal state of the program.
  * If @inited is true, will initialize all
  * drivers again after teardown.
  **/
@@ -1106,7 +1106,7 @@ void rarch_main_free(void)
  * rarch_verify_api_version:
  *
  * Compare libretro core API version against API version
- * used by RetroArch.
+ * used by the program.
  *
  * TODO - when libretro v2 gets added, allow for switching
  * between libretro version backend dynamically.
@@ -1173,7 +1173,7 @@ void rarch_init_system_av_info(void)
  * @argc                 : Count of (commandline) arguments.
  * @argv                 : (Commandline) arguments. 
  *
- * Initializes RetroArch.
+ * Initializes the program.
  *
  * Returns: 0 on success, otherwise 1 if there was an error.
  **/
@@ -1462,7 +1462,7 @@ void rarch_main_set_state(unsigned cmd)
 /**
  * rarch_main_deinit:
  *
- * Deinitializes RetroArch.
+ * Deinitializes the program.
  **/
 void rarch_main_deinit(void)
 {
diff --git a/runloop.c b/runloop.c
index c1b416f5e8..21a89b17a6 100644
--- a/runloop.c
+++ b/runloop.c
@@ -65,7 +65,7 @@ static bool check_pause(bool pause_pressed, bool frameadvance_pressed)
    static bool old_focus    = true;
    bool focus               = true;
    enum event_command cmd   = EVENT_CMD_NONE;
-   bool old_is_paused       = runloop->is_paused;
+   bool old_is_paused       = runloop ? runloop->is_paused : false;
    settings_t *settings     = config_get_ptr();
 
    /* FRAMEADVANCE will set us into pause mode. */
diff --git a/tests/test_reentrancy.c b/tests/test_reentrancy.c
index 9eab3e9614..67e556e119 100644
--- a/tests/test_reentrancy.c
+++ b/tests/test_reentrancy.c
@@ -14,7 +14,7 @@
  */
 
 /* Test module to check re-entrancy of libretro implementations.
- * Reruns RetroArch main loop with all content defined on command-line
+ * Reruns the program's main loop with all content defined on command-line
  * to check if libretro can load multiple content after each other.
  */