diff --git a/src/provider/Player.qml b/src/provider/Player.qml
index 89a1b64..4467539 100644
--- a/src/provider/Player.qml
+++ b/src/provider/Player.qml
@@ -6,7 +6,9 @@ import QtQuick
 
 Singleton {
     id: player
-    property MprisPlayer current: player.all[player.index]
+
+    property var current: player.all[player.index]
+
     property var all: Mpris.players.values
     property int index: {
         const ind = Mpris.players.values.findIndex(p => p.playbackState === MprisPlaybackState.Playing);
diff --git a/src/widgets/battery/Battery.qml b/src/widgets/battery/Battery.qml
index ca90025..8499a9e 100644
--- a/src/widgets/battery/Battery.qml
+++ b/src/widgets/battery/Battery.qml
@@ -41,8 +41,10 @@ BRectangle {
                 return "󱐋"
             else if (UPower.displayDevice?.state === UPowerDeviceState.PendingCharge && !UPower.onBattery)
                 return "󰚥"
+            else
+                return ""
 
-            visible: text
+            visible: text.length
         }
     }
 }
diff --git a/src/windows/notificationtoast/NotificationToasts.qml b/src/windows/notificationtoast/NotificationToasts.qml
index f6f88ea..f239bbd 100644
--- a/src/windows/notificationtoast/NotificationToasts.qml
+++ b/src/windows/notificationtoast/NotificationToasts.qml
@@ -15,13 +15,9 @@ PopupWindow {
     visible: true
 
     mask: Region {
-        item: popups
-
-        Region {
-            intersection: Intersection.Combine
-            height: popupcol.count * 26 + popupcol.count * popupcol.spacing + (mouseArea.containsMouse * 114)
-            width: 300
-        }
+        intersection: Intersection.Combine
+        height: popupcol.count * 26 + popupcol.count * popupcol.spacing + (mouseArea.containsMouse * 114)
+        width: 300
     }
 
     color: "transparent"
@@ -40,7 +36,6 @@ PopupWindow {
             model: ListModel {
                 id: data
                 Component.onCompleted: () => {
-                    console.log(popupcol.count);
                     Notifications.d.notification.connect(e => {
                         data.insert(0, e);
                     });