diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index f947028e02..570ac5fce2 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1979,7 +1979,7 @@ void MyAvatar::loadData() {
 
     // Flying preferences must be loaded before calling setFlyingEnabled()
     Setting::Handle<bool> firstRunVal { Settings::firstRun, true };
-    setFlyingHMDPref(firstRunVal.get() ? false : _flyingHMDSetting.get());
+    setFlyingHMDPref(firstRunVal.get() ? true : _flyingHMDSetting.get());
     setMovementReference(firstRunVal.get() ? false : _movementReferenceSetting.get());
     setDriveGear1(firstRunVal.get() ? DEFAULT_GEAR_1 : _driveGear1Setting.get());
     setDriveGear2(firstRunVal.get() ? DEFAULT_GEAR_2 : _driveGear2Setting.get());
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 877396852e..98008583a4 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -2702,7 +2702,7 @@ private:
 
     bool _enableFlying { false };
     bool _flyingPrefDesktop { true };
-    bool _flyingPrefHMD { false };
+    bool _flyingPrefHMD { true };
     bool _wasPushing { false };
     bool _isPushing { false };
     bool _isBeingPushed { false };
diff --git a/libraries/fbx/src/GLTFSerializer.cpp b/libraries/fbx/src/GLTFSerializer.cpp
index e117e1f211..a7af5518a9 100755
--- a/libraries/fbx/src/GLTFSerializer.cpp
+++ b/libraries/fbx/src/GLTFSerializer.cpp
@@ -399,7 +399,7 @@ bool GLTFSerializer::addBuffer(const QJsonObject& object) {
    
     getIntVal(object, "byteLength", buffer.byteLength, buffer.defined);
 
-    if (_url.toString().endsWith("glb")) {
+    if (_url.path().endsWith("glb")) {
         if (!_glbBinary.isEmpty()) {
             buffer.blob = _glbBinary;
         } else {
@@ -646,7 +646,7 @@ bool GLTFSerializer::parseGLTF(const hifi::ByteArray& data) {
 
     hifi::ByteArray jsonChunk = data;
 
-    if (_url.toString().endsWith("glb") && data.indexOf("glTF") == 0 && data.contains("JSON")) {
+    if (_url.path().endsWith("glb") && data.indexOf("glTF") == 0 && data.contains("JSON")) {
         jsonChunk = setGLBChunks(data);
     }    
    
@@ -1744,8 +1744,8 @@ HFMTexture GLTFSerializer::getHFMTexture(const GLTFTexture& texture) {
         hifi::URL textureUrl = _url.resolved(url);
         fbxtex.name = fname;
         fbxtex.filename = textureUrl.toEncoded();
-        
-        if (_url.toString().endsWith("glb") && !_glbBinary.isEmpty()) {
+
+        if (_url.path().endsWith("glb") && !_glbBinary.isEmpty()) {
             int bufferView = _file.images[texture.source].bufferView;
        
             GLTFBufferView& imagesBufferview = _file.bufferviews[bufferView];