diff --git a/retro-runner/retro-core.c b/retro-runner/retro-core.c
index 79a8cf11c21d72773de1b7f7d89b4dcf6d00649c..3dbc0fae712b48ca43627cd333fd140e0b0e2e08 100644
--- a/retro-runner/retro-core.c
+++ b/retro-runner/retro-core.c
@@ -1238,7 +1238,7 @@ retro_core_get_support_no_game (RetroCore *self)
 /**
  * retro_core_set_support_no_game:
  * @self: a #RetroCore
- * @support_no_game: the save directory
+ * @support_no_game: whether the core supports running with no game
  *
  * Sets whether the core supports running with no game.
  */
@@ -1248,6 +1248,8 @@ retro_core_set_support_no_game (RetroCore *self,
 {
   g_return_if_fail (RETRO_IS_CORE (self));
 
+  support_no_game = !!support_no_game;
+
   if (retro_core_get_support_no_game (self) == support_no_game)
     return;
 
diff --git a/retro-runner/retro-environment.c b/retro-runner/retro-environment.c
index 16fc47fd57ff74eba7f1177a6e2dcf478ab567aa..a5adccb4ef8f6210e189c72ba039cba359383f5d 100644
--- a/retro-runner/retro-environment.c
+++ b/retro-runner/retro-environment.c
@@ -553,8 +553,8 @@ set_rotation (RetroCore           *self,
 }
 
 static gboolean
-set_support_no_game (RetroCore *self,
-                     bool      *support_no_game)
+set_support_no_game (RetroCore  *self,
+                     const bool *support_no_game)
 {
   retro_debug ("Set support no game: %s", TRUENESS (*support_no_game));
 
@@ -685,7 +685,7 @@ environment_core_command (RetroCore *self,
     return set_rotation (self, (RetroRotation *) data);
 
   case RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME:
-    return set_support_no_game (self, (bool *) data);
+    return set_support_no_game (self, (const bool *) data);
 
   case RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO:
     return set_system_av_info (self, (RetroSystemAvInfo *) data);