diff --git a/[editor]/edf/edf.lua b/[editor]/edf/edf.lua
index 89c4fef42..6e9871b83 100644
--- a/[editor]/edf/edf.lua
+++ b/[editor]/edf/edf.lua
@@ -581,7 +581,7 @@ function edfCreateElement(elementType, creatorClient, fromResource, parametersTa
 	parametersTable = parametersTable or {}
 	parametersTable.position = parametersTable.position or {0,0,0}
 	parametersTable.rotation = parametersTable.rotation or {0,0,0}
-	parametersTable.interior = math.max(0, (parametersTable.interior or 0))
+	parametersTable.interior = parametersTable.interior or 0
 	parametersTable.dimension = parametersTable.dimension or 0
 	parametersTable.alpha = parametersTable.alpha or 255
 
diff --git a/[editor]/editor_main/client/main.lua b/[editor]/editor_main/client/main.lua
index 8c9cd5a6e..987276a32 100644
--- a/[editor]/editor_main/client/main.lua
+++ b/[editor]/editor_main/client/main.lua
@@ -214,15 +214,11 @@ addEventHandler("onClientRender", root,
 			local camX2, camY2, camZ2 = getCameraMatrix()
 			local distance = math.sqrt( (targetX - camX2)^2 + (targetY - camY2)^2 + (targetZ - camZ2)^2 )
 			local roundedDistance = string.format("%." .. (DISTANCE_DECIMAL_PLACES) .. "f", distance)
-			local elementName = getElementID(g_targetedElement) or ""
-			local mapContainer = getElementByID("mapContainer")
-			if mapContainer then
-				if getElementParent(g_targetedElement) ~= mapContainer then
-					elementName = "Non-editable object " .. getElementModel(g_targetedElement)
-				end
-			end
-			
-			createHighlighterText(labelCenterX, labelCenterY, elementName, "["..getElementType(g_targetedElement).."]", roundedDistance .. " m")
+			createHighlighterText ( labelCenterX,labelCenterY,
+							getElementID(g_targetedElement) or "",
+							"["..getElementType(g_targetedElement).."]",
+							roundedDistance .. " m"
+			)
 		else
 			if g_targetedElement then
 				g_targetedPart = nil
@@ -742,15 +738,6 @@ function selectElement(element, submode, shortcut, dropreleaseLock, dropclonedro
 	
 	if isColPatchObject(element) then return end
 
-	-- Fixes error when try to edit static object created by script
-	local mapContainer = getElementByID("mapContainer")
-	if mapContainer then
-		if getElementParent(element) ~= mapContainer then
-			editor_gui.outputMessage("Cannot select element, it is created by a different script", 255,255,255)
-			return
-		end
-	end
-
 	if getElementType(element) == "vehicle" and getVehicleType(element) == "Train" then
 		setTrainDerailed(element, true)
 	end
diff --git a/[editor]/editor_main/server/saveloadtest_server.lua b/[editor]/editor_main/server/saveloadtest_server.lua
index 553e8e715..4630cd0a3 100644
--- a/[editor]/editor_main/server/saveloadtest_server.lua
+++ b/[editor]/editor_main/server/saveloadtest_server.lua
@@ -40,7 +40,7 @@ addEventHandler ( "onResourceStart", resourceRoot,
 		setOcclusionsEnabled ( false )
 		restoreAllWorldModels ( )
 		destroyElement( root )
-		mapContainer = createElement("mapContainer", "mapContainer")
+		mapContainer = createElement("mapContainer")
 		setTimer(startUp, 1000, 1)
 	end
 )