diff --git a/examples/example/entities/butterflies.js b/examples/example/entities/butterflies.js
index 7c8cd18376..5ad11c46e9 100644
--- a/examples/example/entities/butterflies.js
+++ b/examples/example/entities/butterflies.js
@@ -106,9 +106,6 @@ function updateButterflies(deltaTime) {
         var CHANCE_OF_IMPULSE = 0.04;
         for (var i = 0; i < numButterflies; i++) {
             if (Math.random() < CHANCE_OF_IMPULSE) {
-                if (!butterflies[i]) {
-                    butterflies[i] = Entities.identifyEntity(butterflies[i]);
-                }
                 var properties = Entities.getEntityProperties(butterflies[i]);
                 if (Vec3.length(Vec3.subtract(properties.position, flockPosition)) > range) {
                     Entities.editEntity(butterflies[i], { position: flockPosition } );
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index e1e4bd6095..ce107f1fbd 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -587,6 +587,7 @@ int EntityTree::processEditPacketData(PacketType packetType, const unsigned char
                             qCDebug(entities) << "User [" << senderNode->getUUID() << "] adding entity.";
                             qCDebug(entities) << "   properties:" << properties;
                         }
+                        properties.setCreated(properties.getLastEdited());
                         EntityItem* newEntity = addEntity(entityItemID, properties);
                         if (newEntity) {
                             newEntity->markAsChangedOnServer();
diff --git a/libraries/entities/src/MovingEntitiesOperator.h b/libraries/entities/src/MovingEntitiesOperator.h
index 51eef0d0e3..760b001081 100644
--- a/libraries/entities/src/MovingEntitiesOperator.h
+++ b/libraries/entities/src/MovingEntitiesOperator.h
@@ -25,11 +25,11 @@ public:
 };
 
 inline uint qHash(const EntityToMoveDetails& a, uint seed) {
-    return qHash(a.entity, seed);
+    return qHash(a.entity->getEntityItemID(), seed);
 }
 
 inline bool operator==(const EntityToMoveDetails& a, const EntityToMoveDetails& b) {
-    return a.entity == b.entity;
+    return a.entity->getEntityItemID() == b.entity->getEntityItemID();
 }
 
 class MovingEntitiesOperator : public RecurseOctreeOperator {
diff --git a/libraries/networking/src/PacketHeaders.h b/libraries/networking/src/PacketHeaders.h
index 9568abb2cb..d64986c1a0 100644
--- a/libraries/networking/src/PacketHeaders.h
+++ b/libraries/networking/src/PacketHeaders.h
@@ -68,9 +68,9 @@ enum PacketType {
     PacketTypeNodeJsonStats,
     PacketTypeEntityQuery, // 40
     PacketTypeEntityData,
-    UNUSED_11,
+    PacketTypeEntityAdd,
     PacketTypeEntityErase,
-    UNUSED_12,
+    PacketTypeEntityEdit,
     PacketTypeOctreeDataNack, // 45
     PacketTypeStopNode,
     PacketTypeAudioEnvironment,
@@ -79,9 +79,7 @@ enum PacketType {
     PacketTypeIceServerHeartbeat, // 50
     PacketTypeIceServerHeartbeatResponse,
     PacketTypeUnverifiedPing,
-    PacketTypeUnverifiedPingReply,
-    PacketTypeEntityAdd,
-    PacketTypeEntityEdit
+    PacketTypeUnverifiedPingReply
 };
 
 typedef char PacketVersion;