diff --git a/config.def.h b/config.def.h
index 6ba1d7b5ed..4607c2eb7b 100644
--- a/config.def.h
+++ b/config.def.h
@@ -48,7 +48,7 @@
 #define DEFAULT_ASPECT_RATIO -1.0f
 #endif
 
-#ifdef RARCH_MOBILE
+#if defined(RARCH_MOBILE) || defined(HAVE_LIBNX)
 static const bool pointer_enable = true;
 #else
 static const bool pointer_enable = false;
diff --git a/gfx/drivers_context/switch_ctx.c b/gfx/drivers_context/switch_ctx.c
index 8acd0d5b47..ccf3c40d02 100644
--- a/gfx/drivers_context/switch_ctx.c
+++ b/gfx/drivers_context/switch_ctx.c
@@ -70,17 +70,19 @@ static void *switch_ctx_init(video_frame_info_t *video_info, void *video_driver)
 
     nx_ctx_ptr = ctx_nx;
 
-    //setenv("MESA_NO_ERROR", "1", 1);
+#if 0
+    setenv("MESA_NO_ERROR", "1", 1);
 
-    // Uncomment below to enable Mesa logging:
-    //setenv("EGL_LOG_LEVEL", "debug", 1);
-    //setenv("MESA_VERBOSE", "all", 1);
-    //setenv("NOUVEAU_MESA_DEBUG", "1", 1);
+    /* Uncomment below to enable Mesa logging: */
+    setenv("EGL_LOG_LEVEL", "debug", 1);
+    setenv("MESA_VERBOSE", "all", 1);
+    setenv("NOUVEAU_MESA_DEBUG", "1", 1);
 
-    // Uncomment below to enable shader debugging in Nouveau:
-    //setenv("NV50_PROG_OPTIMIZE", "0", 1);
-    //setenv("NV50_PROG_DEBUG", "1", 1);
-    //setenv("NV50_PROG_CHIPSET", "0x120", 1);
+    /* Uncomment below to enable shader debugging in Nouveau: */
+    setenv("NV50_PROG_OPTIMIZE", "0", 1);
+    setenv("NV50_PROG_DEBUG", "1", 1);
+    setenv("NV50_PROG_CHIPSET", "0x120", 1);
+#endif
 
 #ifdef HAVE_EGL
     if (!egl_init_context(&ctx_nx->egl, EGL_NONE, EGL_DEFAULT_DISPLAY,
@@ -121,7 +123,7 @@ static bool switch_ctx_set_video_mode(void *data,
                                       unsigned width, unsigned height,
                                       bool fullscreen)
 {
-    // Create an EGL rendering context
+    /* Create an EGL rendering context */
     static const EGLint contextAttributeList[] =
         {
             EGL_CONTEXT_CLIENT_VERSION, 2,
@@ -259,11 +261,13 @@ bool switch_ctx_get_metrics(void *data,
    switch (type)
    {
       case DISPLAY_METRIC_DPI:
-         *value = 236.87; //FIXME: Don't hardcode this value
+         *value = 236.87; /* FIXME: Don't hardcode this value */
          return true;
       default:
-         return false;
+         break;
    }
+
+   return false;
 }
 
 const gfx_ctx_driver_t switch_ctx = {