5 files changed, 14 insertions, 13 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index af4b8965c3..a8e364a4cd 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -692,7 +692,7 @@ Size2 Control::get_minimum_size() const {
 	if (si) {
 
 		Variant::CallError ce;
-		Variant s = si->call(SceneStringNames::get_singleton()->get_minimum_size, NULL, 0, ce);
+		Variant s = si->call(SceneStringNames::get_singleton()->_get_minimum_size, NULL, 0, ce);
 		if (ce.error == Variant::CallError::CALL_OK)
 			return s;
 	}
@@ -2419,7 +2419,7 @@ void Control::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_font_changed"), &Control::_font_changed);
 
 	BIND_VMETHOD(MethodInfo("_gui_input", PropertyInfo(Variant::INPUT_EVENT, "event")));
-	BIND_VMETHOD(MethodInfo(Variant::VECTOR2, "get_minimum_size"));
+	BIND_VMETHOD(MethodInfo(Variant::VECTOR2, "_get_minimum_size"));
 	BIND_VMETHOD(MethodInfo(Variant::OBJECT, "get_drag_data", PropertyInfo(Variant::VECTOR2, "pos")));
 	BIND_VMETHOD(MethodInfo(Variant::BOOL, "can_drop_data", PropertyInfo(Variant::VECTOR2, "pos"), PropertyInfo(Variant::NIL, "data")));
 	BIND_VMETHOD(MethodInfo("drop_data", PropertyInfo(Variant::VECTOR2, "pos"), PropertyInfo(Variant::NIL, "data")));
diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp
index 89008b56bf..a58e62f061 100644
--- a/scene/gui/dialogs.cpp
+++ b/scene/gui/dialogs.cpp
@@ -205,11 +205,11 @@ void WindowDialog::_notification(int p_what) {
 		} break;
 #ifdef TOOLS_ENABLED
 		case NOTIFICATION_POST_POPUP: {
-			if (get_tree() && get_tree()->is_editor_hint())
+			if (get_tree() && get_tree()->is_editor_hint() && EditorNode::get_singleton())
 				EditorNode::get_singleton()->dim_editor(true);
 		} break;
 		case NOTIFICATION_POPUP_HIDE: {
-			if (get_tree() && get_tree()->is_editor_hint())
+			if (get_tree() && get_tree()->is_editor_hint() && EditorNode::get_singleton())
 				EditorNode::get_singleton()->dim_editor(false);
 		} break;
 #endif
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index 0245944154..600dc8737d 100644..100755
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -2020,12 +2020,13 @@ void Node::remove_and_skip() {
 
 		bool clear = true;
 		for (int i = 0; i < data.children.size(); i++) {
-			if (!data.children[i]->get_owner())
+			Node *c_node = data.children[i];
+			if (!c_node->get_owner())
 				continue;
 
-			remove_child(data.children[i]);
-			data.children[i]->_propagate_replace_owner(this, NULL);
-			children.push_back(data.children[i]);
+			remove_child(c_node);
+			c_node->_propagate_replace_owner(this, NULL);
+			children.push_back(c_node);
 			clear = false;
 			break;
 		}
@@ -2036,9 +2037,9 @@ void Node::remove_and_skip() {
 
 	while (!children.empty()) {
 
-		Node *c = children.front()->get();
-		data.parent->add_child(c);
-		c->_propagate_replace_owner(NULL, new_owner);
+		Node *c_node = children.front()->get();
+		data.parent->add_child(c_node);
+		c_node->_propagate_replace_owner(NULL, new_owner);
 		children.pop_front();
 	}
 
diff --git a/scene/scene_string_names.cpp b/scene/scene_string_names.cpp
index ae939ead5f..f0a33e0d3b 100644
--- a/scene/scene_string_names.cpp
+++ b/scene/scene_string_names.cpp
@@ -145,7 +145,7 @@ SceneStringNames::SceneStringNames() {
 	_update_remote = StaticCString::create("_update_remote");
 	_update_pairs = StaticCString::create("_update_pairs");
 
-	get_minimum_size = StaticCString::create("get_minimum_size");
+	_get_minimum_size = StaticCString::create("_get_minimum_size");
 
 	area_entered = StaticCString::create("area_entered");
 	area_exited = StaticCString::create("area_exited");
diff --git a/scene/scene_string_names.h b/scene/scene_string_names.h
index e16e1e04e6..8900bbe1d9 100644
--- a/scene/scene_string_names.h
+++ b/scene/scene_string_names.h
@@ -167,7 +167,7 @@ public:
 	StringName area_entered;
 	StringName area_exited;
 
-	StringName get_minimum_size;
+	StringName _get_minimum_size;
 
 	StringName play_play;