diff --git a/main.qml b/main.qml
--- a/main.qml
+++ b/main.qml
@@ -640,7 +640,7 @@
                 {
                     id: brainzToggle
                     text: checked ? "Turn OFF" : "Turn ON"
-                    checked: activeBrainz
+                    checked: bae.brainzState()
                     checkable: true
                     onToggled:
                     {
diff --git a/mauikit b/mauikit
--- a/mauikit
+++ b/mauikit
@@ -1 +1 @@
-Subproject commit eac4ba3c2f73369aae30014175d20b7833f19ebb
+Subproject commit 2dea6177edf95ad3ef1d5258126dbbd6f8d6102b
diff --git a/services/web/YoutubeHelper.js b/services/web/YoutubeHelper.js
--- a/services/web/YoutubeHelper.js
+++ b/services/web/YoutubeHelper.js
@@ -1,4 +1,4 @@
-var player, timer, timeSpent = [], display = document.getElementById('display');
+var player, timer, timeSpent = [];
 
 function onYouTubeIframeAPIReady() {
     player = new YT.Player( 'player', {
diff --git a/services/web/YoutubeViewer.qml b/services/web/YoutubeViewer.qml
--- a/services/web/YoutubeViewer.qml
+++ b/services/web/YoutubeViewer.qml
@@ -42,7 +42,7 @@
 
                 Label
                 {
-                    text : currentYt ? currentYt.title : "YouTube"
+                    text : currentYt && currentYt.title ? currentYt.title : "YouTube"
                     Layout.fillHeight : true
                     Layout.fillWidth : true
                     Layout.alignment : Qt.AlignCenter
diff --git a/widgets/InfoView/InfoView.qml b/widgets/InfoView/InfoView.qml
--- a/widgets/InfoView/InfoView.qml
+++ b/widgets/InfoView/InfoView.qml
@@ -54,7 +54,7 @@
                 TextEdit
                 {
                     id: lyricsText
-                    text: currentTrack.lyrics
+                    text: currentTrack.lyrics || ""
                     width: infoRoot.width      // ensure correct width
                     height: implicitHeight
                     readOnly: true