diff --git a/VERSION.txt b/VERSION.txt
index 1defe531..826e1424 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-v2.1.0
+v2.1.1
diff --git a/include/float.h b/include/float.h
index 733dde90..963c3165 100644
--- a/include/float.h
+++ b/include/float.h
@@ -4,19 +4,19 @@
 #include "types.h"
 
 typedef enum {
-    FRC_RM_ROUND_TO_NEAREST = 0x0,
-    FRC_RM_ROUND_TO_ZERO = 0x1,
-    FRC_RM_ROUND_TO_POSITIVE_INFINITY = 0x2,
-    FRC_RM_ROUND_TO_MINUS_INFINITY = 0x3
+    FCR_RM_ROUND_TO_NEAREST = 0x0,
+    FCR_RM_ROUND_TO_ZERO = 0x1,
+    FCR_RM_ROUND_TO_POSITIVE_INFINITY = 0x2,
+    FCR_RM_ROUND_TO_MINUS_INFINITY = 0x3
 } FloatRoundingMode;
 
 typedef enum {
-    FRC_EXCEPTION_INEXACT_OPERATION = 0x1,
-    FRC_EXCEPTION_UNDERFLOW = 0x2,
-    FRC_EXCEPTION_OVERFLOW = 0x4,
-    FRC_EXCEPTION_DIVISION_BY_ZERO = 0x8,
-    FRC_EXCEPTION_INVALID_OPERATION = 0x10,
-    FRC_EXCEPTION_UNIMPLEMENTED_OPERATION = 0x20 // only for Cause bits
+    FCR_EXCEPTION_INEXACT_OPERATION = 0x1,
+    FCR_EXCEPTION_UNDERFLOW = 0x2,
+    FCR_EXCEPTION_OVERFLOW = 0x4,
+    FCR_EXCEPTION_DIVISION_BY_ZERO = 0x8,
+    FCR_EXCEPTION_INVALID_OPERATION = 0x10,
+    FCR_EXCEPTION_UNIMPLEMENTED_OPERATION = 0x20 // only for Cause bits
 } FloatExceptionBits;
 
 extern FloatRoundingMode fcr_get_rounding_mode(void);
diff --git a/src/game/emutest.c b/src/game/emutest.c
index ca427026..ef2b912c 100644
--- a/src/game/emutest.c
+++ b/src/game/emutest.c
@@ -101,7 +101,7 @@ void detect_emulator() {
      * RZ will output not 1.0f, RN will output exactly 1.0f
     */
     const FloatRoundingMode roundingMode = fcr_get_rounding_mode();
-    fcr_set_rounding_mode(FRC_RM_ROUND_TO_NEAREST);
+    fcr_set_rounding_mode(FCR_RM_ROUND_TO_NEAREST);
     if (1.0f != round_double_to_float(0.9999999999999999)) {
         gEmulator = EMU_WIIVC;
         fcr_set_rounding_mode(roundingMode);
diff --git a/src/game/rendering_graph_node.c b/src/game/rendering_graph_node.c
index 18c5c533..4fc8c7e5 100644
--- a/src/game/rendering_graph_node.c
+++ b/src/game/rendering_graph_node.c
@@ -47,7 +47,7 @@
  *
  */
 
-s16 gMatStackIndex;
+s16 gMatStackIndex = 0;
 ALIGNED16 Mat4 gMatStack[32];
 ALIGNED16 Mtx *gMatStackFixed[32];
 f32 sAspectRatio;
@@ -722,7 +722,6 @@ void geo_process_camera(struct GraphNodeCamera *node) {
         geo_process_node_and_siblings(node->fnNode.node.children);
         gCurGraphNodeCamera = NULL;
     }
-    gMatStackIndex--;
 }
 
 /**