diff --git a/.github/workflows/static_checks.yml b/.github/workflows/static_checks.yml
new file mode 100644
index 00000000..c9d451a8
--- /dev/null
+++ b/.github/workflows/static_checks.yml
@@ -0,0 +1,13 @@
+name: 📊 Static Checks
+on: push
+
+jobs:
+  format:
+    name: File formatting (mirror-godot-app/.workflows/scripts/file_format.sh)
+    runs-on: "ubuntu-latest"
+    steps:
+      - uses: actions/checkout@v3
+      - name: File formatting checks (file_format.sh)
+        run: |
+          cd ./mirror-godot-app/
+          bash .github/scripts/file_format.sh
diff --git a/godot-engine b/godot-engine
index 8f207f96..4309e8e8 160000
--- a/godot-engine
+++ b/godot-engine
@@ -1 +1 @@
-Subproject commit 8f207f9661f472f93233db5eba430e2bed4b5289
+Subproject commit 4309e8e87e0f559d3fe1dfd22f0dd7280c69f648
diff --git a/mirror-godot-app/.github/workflows/static_checks.yml b/mirror-godot-app/.github/workflows/static_checks.yml
deleted file mode 100644
index bd5a0390..00000000
--- a/mirror-godot-app/.github/workflows/static_checks.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: 📊 Static Checks
-on: push
-
-jobs:
-  format:
-    name: File formatting (file_format.sh)
-    runs-on: ["self-hosted", "Linux"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: File formatting checks (file_format.sh)
-        run: |
-          bash ./.github/scripts/file_format.sh
diff --git a/mirror-godot-app/project.godot b/mirror-godot-app/project.godot
index 2abfc233..386b65f6 100644
--- a/mirror-godot-app/project.godot
+++ b/mirror-godot-app/project.godot
@@ -82,7 +82,7 @@ global_script_class_icons={
 config/name="The Mirror"
 config/version="Beta V1"
 run/main_scene="res://scenes/boot_scene.tscn"
-config/features=PackedStringArray("4.3", "8f207f96", "mirror")
+config/features=PackedStringArray("4.3", "4309e8e8", "mirror")
 boot_splash/bg_color=Color(0.0745098, 0.0862745, 0.184314, 1)
 boot_splash/image="res://art/white_logo_slate_bg_with_text.png"
 boot_splash/fullsize=false
diff --git a/mirror-godot-app/scripts/autoload/zone/client.gd b/mirror-godot-app/scripts/autoload/zone/client.gd
index bf799fa8..85a6adb7 100644
--- a/mirror-godot-app/scripts/autoload/zone/client.gd
+++ b/mirror-godot-app/scripts/autoload/zone/client.gd
@@ -539,7 +539,9 @@ func _join_new_server_locally(space_id: String) -> bool:
 	# When we can ask mirror-web-server for an already existing server to connect to, first
 	# Then we will replace that flag, with that request being done and responded.
 	var should_create_a_new_server_locally = ProjectSettings.get_setting("feature_flags/always_spin_up_local_server", false)
-	if should_create_a_new_server_locally and pid == null:
+	if should_create_a_new_server_locally:
+		if pid != null:
+			OS.kill(pid)
 		var firebase_auth = str(Firebase.Auth.auth.refreshtoken)
 		print(firebase_auth)
 		var arguments = ["--server", "--space", space_id, "--mode", "edit", "--uuid", "localhost", "--server_login", firebase_auth, "--headless", "--remote-debug", "tcp://127.0.0.1:6008"]
@@ -552,7 +554,6 @@ func _join_new_server_locally(space_id: String) -> bool:
 func _find_zone_by_space(space_id: String) -> void:
 	if _join_new_server_locally(space_id):
 		return
-	
 	# Normal join process with dedicated servers
 	var promise = Net.zone_finder.join_build_server(space_id)
 	var build_server = await promise.wait_till_fulfilled()
diff --git a/mirror-godot-app/ui/main_menu/pages/view_space.gd b/mirror-godot-app/ui/main_menu/pages/view_space.gd
index 960897b4..7a9e2582 100644
--- a/mirror-godot-app/ui/main_menu/pages/view_space.gd
+++ b/mirror-godot-app/ui/main_menu/pages/view_space.gd
@@ -121,7 +121,7 @@ func populate(space: Dictionary) -> void:
 	_updated_at_label.text = Util.datetime_dict_to_mmm_dd_yyyy(updated)
 	_url_label.text = _construct_space_url(_space.get("_id", "unknown"))
 	var creator_promise: Promise = Net.user_client.get_user_profile(_space.creator)
-	creator_promise.connect_func_to_fulfill(func(): 
+	creator_promise.connect_func_to_fulfill(func():
 		if creator_promise.is_error():
 			push_error("Failed to get creator")
 		var data = creator_promise.get_result()