diff --git a/addons/escoria-core b/addons/escoria-core
index bda2872d..2a2c7b81 120000
--- a/addons/escoria-core
+++ b/addons/escoria-core
@@ -1 +1 @@
-../../escoria-demo-game/addons/escoria-core
\ No newline at end of file
+../../escoria-demo-game-new-interpreter-and-savegames/addons/escoria-core
\ No newline at end of file
diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres b/addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres
index 0dda08f6..348099e4 100644
--- a/addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres
+++ b/addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres
@@ -1,19 +1,19 @@
-[gd_resource type="Theme" load_steps=3 format=2]
+[gd_resource type="Theme" load_steps=3 format=3 uid="uid://dvwfrnya2nhxu"]
 
-[ext_resource path="res://addons/escoria-ui-return-monkey-island/fonts/caslonantique.tres" type="FontFile" id=1]
+[ext_resource type="FontFile" path="res://addons/escoria-ui-return-monkey-island/fonts/caslonantique.tres" id="1"]
 
-[sub_resource type="StyleBoxFlat" id=1]
+[sub_resource type="StyleBoxFlat" id="1"]
 content_margin_left = 5.0
-content_margin_right = 5.0
 content_margin_top = 5.0
+content_margin_right = 5.0
 content_margin_bottom = 5.0
-bg_color = Color( 0, 0, 0, 0.815686 )
+bg_color = Color(0, 0, 0, 0.815686)
 corner_radius_top_left = 8
 corner_radius_top_right = 8
 corner_radius_bottom_right = 8
 corner_radius_bottom_left = 8
 
 [resource]
-default_font = ExtResource( 1 )
-RichTextLabel/styles/normal = SubResource( 1 )
+default_font = ExtResource("1")
+RichTextLabel/styles/normal = SubResource("1")
 VBoxContainer/constants/separation = 1
diff --git a/addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd b/addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd
index 1b532b4a..08cafd6e 100644
--- a/addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd
+++ b/addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd
@@ -16,6 +16,7 @@ func _init():
 
 # Ready function
 func _ready():
+	super._ready()
 	if selectable:
 		super._ready()
 	else:
diff --git a/addons/escoria-ui-return-monkey-island/overrides/esc_object_manager.gd b/addons/escoria-ui-return-monkey-island/overrides/esc_object_manager.gd
index 99ddc03a..2bf22782 100644
--- a/addons/escoria-ui-return-monkey-island/overrides/esc_object_manager.gd
+++ b/addons/escoria-ui-return-monkey-island/overrides/esc_object_manager.gd
@@ -460,10 +460,10 @@ func save_game(p_savegame: ESCSaveGame) -> void:
 func get_start_location() -> ESCLocation:
 	if _room_exists(current_room_key):
 		for object in _get_room_objects_objects(current_room_key).values():
-			if is_instance_valid(object.node):
-				var loc := object.node as ESCLocation
-				if loc and loc.is_start_location:
-					return loc
+			if is_instance_valid(object.node) \
+					and object.node is ESCLocation \
+					and object.node.is_start_location:
+				return object.node
 
 	escoria.logger.warn(
 		self,
diff --git a/default_env.tres b/default_env.tres
index 1a5570b8..8a17bd79 100644
--- a/default_env.tres
+++ b/default_env.tres
@@ -1,7 +1,7 @@
-[gd_resource type="Environment" load_steps=2 format=2]
+[gd_resource type="Environment" load_steps=2 format=3 uid="uid://b826eo66vqyyg"]
 
-[sub_resource type="Sky" id=1]
+[sub_resource type="Sky" id="1"]
 
 [resource]
 background_mode = 2
-background_sky = SubResource( 1 )
+sky = SubResource("1")