diff --git a/libraries/entities-renderer/CMakeLists.txt b/libraries/entities-renderer/CMakeLists.txt
index 6a45b85271..40ca1ccbc9 100644
--- a/libraries/entities-renderer/CMakeLists.txt
+++ b/libraries/entities-renderer/CMakeLists.txt
@@ -12,4 +12,9 @@ find_package(Bullet REQUIRED)
 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${BULLET_INCLUDE_DIRS})
 target_link_libraries(${TARGET_NAME} ${BULLET_LIBRARIES})
 
+add_dependency_external_projects(polyvox)
+find_package(PolyVox REQUIRED)
+target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${POLYVOX_INCLUDE_DIRS})
+target_link_libraries(${TARGET_NAME} ${POLYVOX_LIBRARIES})
+
 link_hifi_libraries(shared gpu script-engine render render-utils)
diff --git a/libraries/entities/CMakeLists.txt b/libraries/entities/CMakeLists.txt
index d6f7bea9b1..926fd8b4b2 100644
--- a/libraries/entities/CMakeLists.txt
+++ b/libraries/entities/CMakeLists.txt
@@ -7,15 +7,11 @@ add_dependency_external_projects(glm)
 find_package(GLM REQUIRED)
 target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
 
-add_dependency_external_projects(bullet polyvox)
+add_dependency_external_projects(bullet)
 
 find_package(Bullet REQUIRED)
 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${BULLET_INCLUDE_DIRS})
 target_link_libraries(${TARGET_NAME} ${BULLET_LIBRARIES})
 
-find_package(PolyVox REQUIRED)
-target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${POLYVOX_INCLUDE_DIRS})
-target_link_libraries(${TARGET_NAME} ${POLYVOX_LIBRARIES})
-
 link_hifi_libraries(avatars shared octree gpu model fbx networking animation environment)
 include_hifi_library_headers(render)
diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 6073f2150b..4e13e1203e 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -958,9 +958,6 @@ bool EntityItem::setProperties(const EntityItemProperties& properties) {
         #endif
         setLastEdited(now);
         somethingChangedNotification(); // notify derived classes that something has changed
-        if (_created == UNKNOWN_CREATED_TIME) {
-            _created = now;
-        }
         if (getDirtyFlags() & (EntityItem::DIRTY_TRANSFORM | EntityItem::DIRTY_VELOCITIES)) {
             // anything that sets the transform or velocity must update _lastSimulated which is used
             // for kinematic extrapolation (e.g. we want to extrapolate forward from this moment
@@ -969,6 +966,16 @@ bool EntityItem::setProperties(const EntityItemProperties& properties) {
         }
     }
 
+    // timestamps
+    quint64 timestamp = properties.getCreated();
+    if (_created == UNKNOWN_CREATED_TIME && timestamp != UNKNOWN_CREATED_TIME) {
+        quint64 now = usecTimestampNow();
+        if (timestamp > now) {
+            timestamp = now;
+        }
+        _created = timestamp;
+    }
+
     return somethingChanged;
 }
 
diff --git a/tests/physics/src/MeshMassPropertiesTests.h b/tests/physics/src/MeshMassPropertiesTests.h
index ab352bfce2..07cd774d34 100644
--- a/tests/physics/src/MeshMassPropertiesTests.h
+++ b/tests/physics/src/MeshMassPropertiesTests.h
@@ -15,7 +15,7 @@ namespace MeshMassPropertiesTests{
     void testParallelAxisTheorem();
     void testTetrahedron();
     void testOpenTetrahedonMesh();
-	void testClosedTetrahedronMesh();
+    void testClosedTetrahedronMesh();
     void testBoxAsMesh();
     void runAllTests();
 }