diff --git a/src/FlightMap/Widgets/ValuePageWidget.qml b/src/FlightMap/Widgets/ValuePageWidget.qml
index e0db7f7527469e96616e62e5537de05e12b1ae7c..d58f7ee7f203cf9bc173bd8204495717e9dd4bde 100644
--- a/src/FlightMap/Widgets/ValuePageWidget.qml
+++ b/src/FlightMap/Widgets/ValuePageWidget.qml
@@ -112,33 +112,32 @@ Column {
                         anchors.bottom:         _settingsUnlocked ? undefined : parent.bottom
 
                         QGCLabel {
-                            width:                  columnRepeater.columnWidth
-                            height:                 _columnButtonsTotalHeight
-                            font.pointSize:         ScreenTools.smallFontPointSize
-                            text:                   _settingsUnlocked ? qsTr("BLANK") : ""
-                            horizontalAlignment:    Text.AlignHCenter
-                            verticalAlignment:      Text.AlignVCenter
-                            visible:                !object.fact
+                            anchors.horizontalCenter:   parent.horizontalCenter
+                            height:                     _columnButtonsTotalHeight
+                            font.pointSize:             ScreenTools.smallFontPointSize
+                            text:                       _settingsUnlocked ? qsTr("BLANK") : ""
+                            horizontalAlignment:        Text.AlignHCenter
+                            verticalAlignment:          Text.AlignVCenter
+                            visible:                    !object.fact
                         }
 
                         QGCLabel {
-                            id:                     label
-                            width:                  columnRepeater.columnWidth
-                            font.pointSize:         ScreenTools.smallFontPointSize
-                            text:                   object.label.toUpperCase()
-                            horizontalAlignment:    Text.AlignHCenter
-                            visible:                object.fact && object.label
+                            id:                         label
+                            anchors.horizontalCenter:   parent.horizontalCenter
+                            font.pointSize:             ScreenTools.smallFontPointSize
+                            text:                       object.label.toUpperCase()
+                            horizontalAlignment:        Text.AlignHCenter
+                            visible:                    object.fact && object.label
                         }
 
                         QGCLabel {
-                            id:                     value
-                            anchors.topMargin:      label.visible ? 2 : 0
-                            anchors.top:            label.visible ? label.bottom : parent.top
-                            width:                  columnRepeater.columnWidth
-                            font.pointSize:         _rgFontSizes[object.fontSize]
-                            text:                   visible ? (object.fact.enumOrValueString + (object.showUnits ? object.fact.units : "")) : ""
-                            horizontalAlignment:    Text.AlignHCenter
-                            visible:                object.fact
+                            id:                         value
+                            anchors.horizontalCenter:   parent.horizontalCenter
+                            anchors.topMargin:          label.visible ? 2 : 0
+                            anchors.top:                label.visible ? label.bottom : parent.top
+                            font.pointSize:             _rgFontSizes[object.fontSize]
+                            text:                       visible ? (object.fact.enumOrValueString + (object.showUnits ? object.fact.units : "")) : ""
+                            visible:                    object.fact
                         }
                     }
                 } // Repeater - columns
diff --git a/src/QmlControls/QGCFileDialog.qml b/src/QmlControls/QGCFileDialog.qml
index 21932d7c07d4a47d46d086be53d26c2c139cf98e..aba634bb40163ad955b6a0d1a8f44da84460f276 100644
--- a/src/QmlControls/QGCFileDialog.qml
+++ b/src/QmlControls/QGCFileDialog.qml
@@ -38,7 +38,9 @@ Item {
     onFolderChanged:            _updateMobileShortPath()
 
     function _updateMobileShortPath() {
-        _mobileShortPath = controller.fullFolderPathToShortMobilePath(folder);
+        if (ScreenTools.isMobile) {
+            _mobileShortPath = controller.fullFolderPathToShortMobilePath(folder);
+        }
     }
 
     function setupFileExtensions() {
diff --git a/src/QmlControls/QGCLabel.qml b/src/QmlControls/QGCLabel.qml
index 26afb1b8e8654d907b6823eed79ca3259e110248..3364dd7b70970629f0c71685f0c38e3052409e1b 100644
--- a/src/QmlControls/QGCLabel.qml
+++ b/src/QmlControls/QGCLabel.qml
@@ -9,4 +9,6 @@ Text {
     font.family:    ScreenTools.normalFontFamily
     color:          qgcPal.text
     antialiasing:   true
+
+    QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
 }