diff --git a/interface/resources/qml/windows/ScrollingWindow.qml b/interface/resources/qml/windows/ScrollingWindow.qml
index 7f0fa2a8e9..1ca9b9880a 100644
--- a/interface/resources/qml/windows/ScrollingWindow.qml
+++ b/interface/resources/qml/windows/ScrollingWindow.qml
@@ -133,7 +133,6 @@ Window {
             // Optional non-scrolling footer.
             id: footerPane
 
-            // @@@@@@@ TODO: Are these aliases actually needed?
             property alias keyboardOverride: window.keyboardOverride
             property alias keyboardRaised: window.keyboardRaised
             property alias punctuationMode: window.punctuationMode
@@ -212,6 +211,8 @@ Window {
     }
 
     Component.onCompleted: {
-        keyboardEnabled = HMD.active;
+        if (typeof HMD !== "undefined") {
+            keyboardEnabled = HMD.active;
+        }
     }
 }
diff --git a/libraries/gl/src/gl/OffscreenQmlSurface.cpp b/libraries/gl/src/gl/OffscreenQmlSurface.cpp
index f9a7ef09e7..d16968f370 100644
--- a/libraries/gl/src/gl/OffscreenQmlSurface.cpp
+++ b/libraries/gl/src/gl/OffscreenQmlSurface.cpp
@@ -309,6 +309,7 @@ void OffscreenQmlSurface::create(QOpenGLContext* shareContext) {
     }
 
     // FIXME 
+    _glData = ::getGLContextData();  // Initialize JSON structure so that it can be filled in later and then used in QML.
     _qmlEngine->rootContext()->setContextProperty("GL", _glData);
     _qmlEngine->rootContext()->setContextProperty("offscreenWindow", QVariant::fromValue(getWindow()));
     _qmlComponent = new QQmlComponent(_qmlEngine);