diff --git a/Makefile b/Makefile
index 2f77ed966d..1a6720f5af 100644
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,7 @@ ifeq ($(DEBUG),1)
 	STRIP = :
 else
 	CFLAGS += -O3
+	debug_opts=-DNDEBUG
 endif
 
 ifeq ($(PROFILE),1)
@@ -220,8 +221,9 @@ SOURCES = \
 	src/i_time \
 	src/lua_hudlib_drawlist \
 	src/r_fps \
-	src/hardware/u_list
-
+	src/u_list \
+	src/blua/loslib \
+	src/r_bbox
 
 PKGSUFFIX ?= $(SUFFIX)
 
diff --git a/Makefile_cfgs/Platforms/Switch.cfg b/Makefile_cfgs/Platforms/Switch.cfg
index c2cf204b67..37ab55e009 100644
--- a/Makefile_cfgs/Platforms/Switch.cfg
+++ b/Makefile_cfgs/Platforms/Switch.cfg
@@ -22,7 +22,7 @@ LIBPATHS += `$(PKGCONFIG) --libs-only-L libglad egl glesv1_cm`
 SUFFIX =	.elf
 PKGSUFFIX = .nro
 
-SRB2VERSION = 2.2.11
+SRB2VERSION = 2.2.12
 APPDIR=$(OUTDIR)/switch/$(NAME)
 ASSETSDIR=./assets
 NROUPDATEZIPNAME=$(NAME)_$(SRB2VERSION).update.nro.zip
diff --git a/downloadassets.sh b/downloadassets.sh
index 1b16198d52..ec48b893b4 100755
--- a/downloadassets.sh
+++ b/downloadassets.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-FULLURL="https://github.com/STJr/SRB2/releases/download/SRB2_release_2.2.11/SRB2-v2211-Full.zip"
+FULLURL="https://github.com/STJr/SRB2/releases/download/SRB2_release_2.2.12/SRB2-v2212-Full.zip"
 PATCHURL=""
 DOWNLOADCMD="curl -Lo"
 
diff --git a/src/screen.c b/src/screen.c
index 6fb92fa581..c74326b997 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -71,10 +71,10 @@ consvar_t cv_scr_depth = CVAR_INIT ("scr_depth", "32 bits", CV_SAVE, scr_depth_c
 #else
 consvar_t cv_scr_width = CVAR_INIT ("scr_width", "1280", CV_SAVE, CV_Unsigned, NULL);
 consvar_t cv_scr_height = CVAR_INIT ("scr_height", "800", CV_SAVE, CV_Unsigned, NULL);
-consvar_t cv_scr_width_w = CVAR_INIT ("scr_width_w", "640", CV_SAVE, CV_Unsigned, NULL);
-consvar_t cv_scr_height_w = CVAR_INIT ("scr_height_w", "400", CV_SAVE, CV_Unsigned, NULL);
 consvar_t cv_scr_depth = CVAR_INIT ("scr_depth", "16 bits", CV_SAVE, scr_depth_cons_t, NULL);
 #endif
+consvar_t cv_scr_width_w = CVAR_INIT ("scr_width_w", "640", CV_SAVE, CV_Unsigned, NULL);
+consvar_t cv_scr_height_w = CVAR_INIT ("scr_height_w", "400", CV_SAVE, CV_Unsigned, NULL);
 consvar_t cv_renderview = CVAR_INIT ("renderview", "On", 0, CV_OnOff, NULL);
 
 CV_PossibleValue_t cv_renderer_t[] = {