3 files changed, 10 insertions, 7 deletions
diff --git a/core/string/ustring.cpp b/core/string/ustring.cpp
index 6218c21cde..dbbcedca84 100644
--- a/core/string/ustring.cpp
+++ b/core/string/ustring.cpp
@@ -3669,13 +3669,16 @@ String String::simplify_path() const {
 	String drive;
 	if (s.begins_with("local://")) {
 		drive = "local://";
-		s = s.substr(8, s.length());
+		s = s.substr(8);
 	} else if (s.begins_with("res://")) {
 		drive = "res://";
-		s = s.substr(6, s.length());
+		s = s.substr(6);
 	} else if (s.begins_with("user://")) {
 		drive = "user://";
-		s = s.substr(7, s.length());
+		s = s.substr(7);
+	} else if (s.begins_with("uid://")) {
+		drive = "uid://";
+		s = s.substr(6);
 	} else if (is_network_share_path()) {
 		drive = s.substr(0, 2);
 		s = s.substr(2, s.length() - 2);
@@ -3689,7 +3692,7 @@ String String::simplify_path() const {
 		}
 		if (p != -1 && p < s.find("/")) {
 			drive = s.substr(0, p + 2);
-			s = s.substr(p + 2, s.length());
+			s = s.substr(p + 2);
 		}
 	}
 
diff --git a/editor/plugins/tiles/tiles_editor_plugin.cpp b/editor/plugins/tiles/tiles_editor_plugin.cpp
index 68bc4389a2..364c3b7246 100644
--- a/editor/plugins/tiles/tiles_editor_plugin.cpp
+++ b/editor/plugins/tiles/tiles_editor_plugin.cpp
@@ -268,8 +268,8 @@ List<int> TilesEditorPlugin::get_sorted_sources(const Ref<TileSet> p_tile_set) c
 	SourceNameComparator::tile_set = p_tile_set;
 	List<int> source_ids;
 
-	for (int i = 0; i < tile_set->get_source_count(); i++) {
-		source_ids.push_back(tile_set->get_source_id(i));
+	for (int i = 0; i < p_tile_set->get_source_count(); i++) {
+		source_ids.push_back(p_tile_set->get_source_id(i));
 	}
 
 	switch (source_sort) {
diff --git a/editor/plugins/tiles/tiles_editor_plugin.h b/editor/plugins/tiles/tiles_editor_plugin.h
index b1fe6f8df6..bdada9ec90 100644
--- a/editor/plugins/tiles/tiles_editor_plugin.h
+++ b/editor/plugins/tiles/tiles_editor_plugin.h
@@ -122,7 +122,7 @@ public:
 
 	// Sorting.
 	void set_sorting_option(int p_option);
-	List<int> get_sorted_sources(const Ref<TileSet> tile_set) const;
+	List<int> get_sorted_sources(const Ref<TileSet> p_tile_set) const;
 
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;