diff --git a/interface/src/octree/SafeLanding.cpp b/interface/src/octree/SafeLanding.cpp
index 354a4046fa..c1556b908d 100644
--- a/interface/src/octree/SafeLanding.cpp
+++ b/interface/src/octree/SafeLanding.cpp
@@ -66,20 +66,24 @@ void SafeLanding::addTrackedEntity(const EntityItemID& entityID) {
         EntityItemPointer entity = _entityTree->findEntityByID(entityID);
 
         if (entity && !entity->getCollisionless()) {
-            static const std::set<ShapeType> downloadedCollisionTypes
-                { SHAPE_TYPE_COMPOUND, SHAPE_TYPE_SIMPLE_COMPOUND, SHAPE_TYPE_STATIC_MESH,  SHAPE_TYPE_SIMPLE_HULL };
-            bool hasAABox;
-            entity->getAABox(hasAABox);
-            if (hasAABox && downloadedCollisionTypes.count(entity->getShapeType()) != 0) {
-                // Only track entities with downloaded collision bodies.
-                _trackedEntities.emplace(entityID, entity);
+            const auto& entityType = entity->getType();
+            if (entityType == EntityTypes::Model) {
+                ModelEntityItem * modelEntity = std::dynamic_pointer_cast<ModelEntityItem>(entity).get();
+                static const std::set<ShapeType> downloadedCollisionTypes
+                    { SHAPE_TYPE_COMPOUND, SHAPE_TYPE_SIMPLE_COMPOUND, SHAPE_TYPE_STATIC_MESH,  SHAPE_TYPE_SIMPLE_HULL };
+                bool hasAABox;
+                entity->getAABox(hasAABox);
+                if (hasAABox && downloadedCollisionTypes.count(modelEntity->getShapeType()) != 0) {
+                    // Only track entities with downloaded collision bodies.
+                    _trackedEntities.emplace(entityID, entity);
 
-                float trackedEntityCount = (float)_trackedEntities.size();
+                    float trackedEntityCount = (float)_trackedEntities.size();
 
-                if (trackedEntityCount > _maxTrackedEntityCount) {
-                    _maxTrackedEntityCount = trackedEntityCount;
+                    if (trackedEntityCount > _maxTrackedEntityCount) {
+                        _maxTrackedEntityCount = trackedEntityCount;
+                    }
+                    qCDebug(interfaceapp) << "Safe Landing: Tracking entity " << entity->getItemName();
                 }
-                qCDebug(interfaceapp) << "Safe Landing: Tracking entity " << entity->getItemName();
             }
         }
     }
@@ -155,7 +159,6 @@ bool SafeLanding::isEntityPhysicsComplete() {
         auto entity = entityMapIter->second;
         if (!entity->shouldBePhysical() || entity->isReadyToComputeShape()) {
             entityMapIter = _trackedEntities.erase(entityMapIter);
-            qDebug() << "--> removing entity <--";
             if (entityMapIter == _trackedEntities.end()) {
                 break;
             }
diff --git a/interface/src/ui/OverlayConductor.cpp b/interface/src/ui/OverlayConductor.cpp
index e27001567f..398f9cf147 100644
--- a/interface/src/ui/OverlayConductor.cpp
+++ b/interface/src/ui/OverlayConductor.cpp
@@ -103,6 +103,7 @@ void OverlayConductor::update(float dt) {
 
     bool targetVisible = Menu::getInstance()->isOptionChecked(MenuOption::Overlays) && !_suppressedByHead;
     if (targetVisible != currentVisible) {
+        qDebug() << "setting pinned: " << !targetVisible;
         offscreenUi->setPinned(!targetVisible);
     }
     if (shouldRecenter && !_suppressedByHead) {
diff --git a/scripts/system/interstitialPage.js b/scripts/system/interstitialPage.js
index 76d2a8b958..ddfc8b3a32 100644
--- a/scripts/system/interstitialPage.js
+++ b/scripts/system/interstitialPage.js
@@ -207,6 +207,18 @@
         return ((1 - t) * a + t * b);
     }
 
+    function resetValues() {
+         var properties = {
+            localPosition: { x: 1.85, y: -0.935, z: 0.0 },
+            dimensions: {
+                x: 0.1,
+                y: 2.8
+            }
+        };
+
+        Overlays.editOverlay(loadingBarProgress, properties);
+    }
+
     function startInterstitialPage() {
         if (timer === null) {
             updateOverlays(Window.isPhysicsEnabled());
@@ -323,6 +335,10 @@
         Overlays.editOverlay(loadingBarPlacard, properties);
         Overlays.editOverlay(loadingBarProgress, loadingBarProperties);
 
+        if (physicsEnabled) {
+            resetValues();
+        }
+
         Camera.mode = "first person";
     }
 
@@ -409,6 +425,10 @@
         if (DEBUG) {
             tablet.removeButton(button);
         }
+
+        renderViewTask.getConfig("LightingModel")["enableAmbientLight"] = true;
+        renderViewTask.getConfig("LightingModel")["enableDirectionalLight"] = true;
+        renderViewTask.getConfig("LightingModel")["enablePointLight"] = true;
     }
 
     Script.scriptEnding.connect(cleanup);