diff --git a/Makefile.ctr b/Makefile.ctr
index 28d2ac407e..80d2ca43c8 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -52,8 +52,8 @@ ifeq ($(GRIFFIN_BUILD), 1)
 	OBJ += griffin/griffin.o
 	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_RGUI -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB -DHAVE_CC_RESAMPLER
 	DEFINES += -DHAVE_ZLIB -DHAVE_7ZIP -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA
-	DEFINES += -DHAVE_NETWORKING -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_ONLINE_UPDATER
-	#DEFINES += -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES
+	DEFINES += -DHAVE_NETWORKING -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_CORES
+	#DEFINES += -DHAVE_UPDATE_ASSETS
 	DEFINES += -DHAVE_PATCH -DHAVE_RWAV
 	DEFINES += -DHAVE_SCREENSHOTS
 	DEFINES += -DHAVE_REWIND
diff --git a/config.def.h b/config.def.h
index 22bcb73415..d9e34d497f 100644
--- a/config.def.h
+++ b/config.def.h
@@ -544,7 +544,7 @@ static const bool menu_show_quit_retroarch     = true;
 static const bool menu_show_restart_retroarch  = true;
 static const bool menu_show_reboot             = true;
 static const bool menu_show_shutdown           = true;
-#if defined(HAVE_LAKKA) || defined(VITA) || defined(_3DS)
+#if defined(HAVE_LAKKA) || defined(VITA)
 static const bool menu_show_core_updater       = false;
 #else
 static const bool menu_show_core_updater       = true;
@@ -1400,6 +1400,8 @@ static const bool enable_device_vibration    = false;
 #define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/nintendo/wiiu/latest/"
 #elif defined(HAVE_LIBNX)
 #define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/nintendo/switch/libnx/latest/"
+#elif defined(_3DS)
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/nintendo/3ds/latest/"
 #else
 #define DEFAULT_BUILDBOT_SERVER_URL ""
 #endif
diff --git a/configuration.c b/configuration.c
index e696fbe790..b252baca71 100644
--- a/configuration.c
+++ b/configuration.c
@@ -2351,9 +2351,13 @@ void config_set_defaults(void *data)
             retro_assert(j == keyval->id);
       }
    }
-
+#ifdef _3DS
+   configuration_set_string(settings,
+         settings->paths.network_buildbot_url, envIsHomebrew() ? DEFAULT_BUILDBOT_SERVER_URL"3dsx/" : DEFAULT_BUILDBOT_SERVER_URL"cia/");
+#else
    configuration_set_string(settings,
          settings->paths.network_buildbot_url, DEFAULT_BUILDBOT_SERVER_URL);
+#endif
    configuration_set_string(settings,
          settings->paths.network_buildbot_assets_url,
          DEFAULT_BUILDBOT_ASSETS_SERVER_URL);
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 5737b04560..1fd7184e0c 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -11382,7 +11382,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                      MENU_ENUM_LABEL_UPDATE_CHEATS,
                      MENU_SETTING_ACTION, 0, 0))
                count++;
-
+#endif
 #ifdef HAVE_LIBRETRODB
 #if !defined(VITA)
             if (menu_entries_append_enum(info->list,
@@ -11393,7 +11393,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                count++;
 #endif
 #endif
-
+#if !defined(_3DS)
             if (menu_entries_append_enum(info->list,
                      msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UPDATE_OVERLAYS),
                      msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_OVERLAYS),