diff --git a/VERSION.txt b/VERSION.txt
index 826e1424..59696826 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-v2.1.1
+v2.1.2
diff --git a/src/game/behaviors/intro_scene.inc.c b/src/game/behaviors/intro_scene.inc.c
index b879ba4d..b7be1861 100644
--- a/src/game/behaviors/intro_scene.inc.c
+++ b/src/game/behaviors/intro_scene.inc.c
@@ -35,7 +35,7 @@ void bhv_intro_scene_loop(void) {
 
         switch (gCutsceneObjSpawn) {
             case CUTSCENE_OBJ_BEGINNING_LAKITU:
-                spawn_object(o, MODEL_LAKITU, bhvBeginningLakitu);
+                spawn_object_at_origin(o, 0, MODEL_LAKITU, bhvBeginningLakitu);
                 break;
 
             case CUTSCENE_OBJ_BEGINNING_PEACH:
diff --git a/tools/Flips/Flips.cpp b/tools/FlipsSrc/Flips.cpp
similarity index 100%
rename from tools/Flips/Flips.cpp
rename to tools/FlipsSrc/Flips.cpp
diff --git a/tools/Flips/Flips.h b/tools/FlipsSrc/Flips.h
similarity index 100%
rename from tools/Flips/Flips.h
rename to tools/FlipsSrc/Flips.h
diff --git a/tools/Makefile b/tools/Makefile
index a6ad61f9..cd5d6b10 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -65,7 +65,7 @@ ifeq ($(HOST_ENV),MinGW)
 endif
 
 flips: CC := $(CXX)
-flips_SOURCES := Flips/Flips.cpp
+flips_SOURCES := FlipsSrc/Flips.cpp
 flips_CFLAGS := -Wall -Wextra -fopenmp -Os -flto -fuse-linker-plugin -fomit-frame-pointer -fmerge-all-constants \
 -fvisibility=hidden -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables \
 -ffunction-sections -fdata-sections -Wl,--gc-sections \