diff --git a/[editor]/editor_main/client/elementcreation.lua b/[editor]/editor_main/client/elementcreation.lua
index afd9a884e..9ac378479 100644
--- a/[editor]/editor_main/client/elementcreation.lua
+++ b/[editor]/editor_main/client/elementcreation.lua
@@ -79,5 +79,5 @@ function doCloneElement ( element, attachMode )
 	if exports["editor_gui"]:sx_getOptionData("randomizeRotation") == true then
 		rotationData = getRandomRotation()
 	end
-	triggerServerEvent( "doCloneElement", element, attachMode, rotationData )
+	triggerServerEvent( "doCloneElement", element, attachMode, false, rotationData )
 end
diff --git a/[editor]/editor_main/server/createdestroy.lua b/[editor]/editor_main/server/createdestroy.lua
index 410c9ec18..b6f151096 100644
--- a/[editor]/editor_main/server/createdestroy.lua
+++ b/[editor]/editor_main/server/createdestroy.lua
@@ -19,7 +19,7 @@ function setupNewElement(element, creatorResource, creatorClient, attachLater,sh
 	makeElementStatic( element )
 	assignID ( element )
 	triggerEvent ( "onElementCreate_undoredo", element )
-	if attachLater then
+	if attachLater and creatorClient then
 		setTimer(triggerClientEvent, WAIT_LOAD_INTERVAL, 1, creatorClient, "doSelectElement", element, selectionSubmode, shortcut )
 	end
 	justCreated[element] = true --mark it so undoredo ignores first placement
@@ -56,7 +56,7 @@ addEventHandler ( "doCreateElement", root,
 )
 
 addEventHandler ( "doCloneElement", root,
-	function (attachMode,rotationData,creator)
+	function (attachMode, creator, rotationData)
 		if client and not isPlayerAllowedToDoEditorAction(client,"createElement") then
 			editor_gui.outputMessage ("You don't have permissions to clone an element!", client,255,0,0)
 			return