diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 9763a42a7e..12924995f1 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1498,6 +1498,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         }
 
         _connectionMonitor.init();
+        // After all of the constructor is completed, then set firstRun to false.
+        firstRun.set(false);
     }
 
     // Monitor model assets (e.g., from Clara.io) added to the world that may need resizing.
@@ -1517,9 +1519,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
 
     connect(this, &QCoreApplication::aboutToQuit, this, &Application::addAssetToWorldMessageClose);
     connect(&domainHandler, &DomainHandler::hostnameChanged, this, &Application::addAssetToWorldMessageClose);
-
-    // After all of the constructor is completed, then set firstRun to false.
-    firstRun.set(false);
 }
 
 void Application::domainConnectionRefused(const QString& reasonMessage, int reasonCodeInt, const QString& extraInfo) {
@@ -4070,6 +4069,7 @@ void Application::setKeyboardFocusOverlay(unsigned int overlayID) {
         if (overlayType == Web3DOverlay::TYPE && isVisible) {
             auto overlay = std::dynamic_pointer_cast<Web3DOverlay>(getOverlays().getOverlay(overlayID));
             overlay->setProxyWindow(_window->windowHandle());
+
             if (_keyboardMouseDevice->isActive()) {
                 _keyboardMouseDevice->pluginFocusOutEvent();
             }
diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js
index 49d03581a9..384e0e24a6 100644
--- a/scripts/system/controllers/handControllerGrab.js
+++ b/scripts/system/controllers/handControllerGrab.js
@@ -27,7 +27,7 @@ Script.include("../libraries/controllers.js");
 // add lines where the hand ray picking is happening
 //
 var WANT_DEBUG = false;
-var WANT_DEBUG_STATE = true;
+var WANT_DEBUG_STATE = false;
 var WANT_DEBUG_SEARCH_NAME = null;
 
 var FORCE_IGNORE_IK = false;
@@ -750,7 +750,6 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp) {
 // global EquipHotspotBuddy instance
 var equipHotspotBuddy = new EquipHotspotBuddy();
 
-
 function MyController(hand) {
     this.hand = hand;
     this.autoUnequipCounter = 0;
@@ -1194,6 +1193,7 @@ function MyController(hand) {
             }
         }
 
+
         var controllerLocation = getControllerWorldLocation(this.handToController(), true);
         var worldHandPosition = controllerLocation.position;
 
diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js
index 3d4a846d45..753161d074 100644
--- a/scripts/system/libraries/WebTablet.js
+++ b/scripts/system/libraries/WebTablet.js
@@ -65,7 +65,7 @@ WebTablet = function (url, width, dpi, location, clientOnly) {
         dimensions: {x: WIDTH, y: HEIGHT, z: DEPTH},
         parentID: MyAvatar.sessionUUID,
         parentJointIndex: SENSOR_TO_ROOM_MATRIX
-    }, clientOnly);
+    };
 
     if (location) {
         tabletProperties.localPosition = location.localPosition;
@@ -111,11 +111,11 @@ WebTablet = function (url, width, dpi, location, clientOnly) {
     this.receive = function (channel, senderID, senderUUID, localOnly) {
         if (_this.homeButtonEntity == senderID) {
             if (_this.clicked) {
-                Entities.editEntity(_this.homeButtonEntity, {color: {red: 0, green: 255, blue: 255}});
-                _this.clicked = false;
+               Entities.editEntity(_this.homeButtonEntity, {color: {red: 0, green: 255, blue: 255}});
+               _this.clicked = false;
             } else {
-                Entities.editEntity(_this.homeButtonEntity, {color: {red: 255, green: 255, blue: 0}});
-                _this.clicked = true;
+               Entities.editEntity(_this.homeButtonEntity, {color: {red: 255, green: 255, blue: 0}});
+               _this.clicked = true;
             }
         }
     }