diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index d493c75b9..190f24a4e 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -909,6 +909,7 @@ PopupSubMenu.prototype = {
         if (this._activeMenuItem)
             this._activeMenuItem.setActive(false);
 
+        this._arrow.rotation_angle_z = 0;
         this.actor.hide();
 
         this.isOpen = false;
diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
index ead3b1f88..bde3f46cf 100644
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@@ -124,18 +124,20 @@ Indicator.prototype = {
         this._deviceItems = [];
 
         let devices = this._applet.get_devices();
-        if (devices.length == 0)
-            this._deviceSep.actor.hide();
-        else
-            this._deviceSep.actor.show();
+        let anydevice = false;
         for (let i = 0; i < devices.length; i++) {
             let d = devices[i];
             let item = this._createDeviceItem(d);
             if (item) {
                 this.menu.addMenuItem(item, this._deviceItemPosition + this._deviceItems.length);
                 this._deviceItems.push(item);
+                anydevice = true;
             }
         }
+        if (anydevice)
+            this._deviceSep.actor.show();
+        else
+            this._deviceSep.actor.hide();
     },
 
     _createDeviceItem: function(device) {
diff --git a/src/gnome-shell-clock-preferences.in b/src/gnome-shell-clock-preferences.in
index b2f94986c..76391a8e0 100644
--- a/src/gnome-shell-clock-preferences.in
+++ b/src/gnome-shell-clock-preferences.in
@@ -18,7 +18,7 @@ uiFile="$uiDir/clock-preferences.ui"
 export GJS_PATH="$jsDir"
 export GSETTINGS_SCHEMA_DIR="$schemaDir"
 
-@GJS_CONSOLE@ -c "const ClockPreferences = imports.prefs.clockPreferences;
+@GJS_CONSOLE@ --js-version 1.8 -c "const ClockPreferences = imports.prefs.clockPreferences;
 ClockPreferences.main({ progName: '$progName',
                         uiFile: '$uiFile',
                         localeDir: '$localeDir' });"