diff --git a/faces/facepackages/piechart/contents/config/main.xml b/faces/facepackages/piechart/contents/config/main.xml
index 3bcd670..a171edb 100644
--- a/faces/facepackages/piechart/contents/config/main.xml
+++ b/faces/facepackages/piechart/contents/config/main.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
   <kcfgfile name=""/>
 
     <group name="General">
         <entry name="fromAngle" type="Int">
             <default>-180</default>
         </entry>
         <entry name="toAngle" type="Int">
-            <default>360</default>
+            <default>180</default>
         </entry>
         <entry name="smoothEnds" type="Bool">
             <default>true</default>
         </entry>
         <entry name="showLegend" type="Bool">
             <default>true</default>
         </entry>
         <entry name="rangeFrom" type="Int">
             <default>0</default>
         </entry>
         <entry name="rangeTo" type="Int">
             <default>100</default>
         </entry>
         <entry name="rangeAuto" type="Bool">
             <default>true</default>
         </entry>
     </group>
     
 </kcfg>
diff --git a/faces/import/ExtendedLegend.qml b/faces/import/ExtendedLegend.qml
index 24a0cbc..aace980 100644
--- a/faces/import/ExtendedLegend.qml
+++ b/faces/import/ExtendedLegend.qml
@@ -1,71 +1,75 @@
 /*
  *   Copyright 2019 Marco Martin <mart@kde.org>
  *   Copyright 2019 David Edmundson <davidedmundson@kde.org>
  *   Copyright 2019 Arjen Hiemstra <ahiemstra@heimr.nl>
  *   Copyright 2019 Kai Uwe Broulik <kde@broulik.de>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
  *   published by the Free Software Foundation; either version 2, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU General Public License for more details
  *
  *   You should have received a copy of the GNU Library General Public
  *   License along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 import QtQuick 2.9
 import QtQuick.Layouts 1.1
 
 import org.kde.kirigami 2.8 as Kirigami
 
 import org.kde.ksysguard.formatter 1.0
 import org.kde.ksysguard.sensors 1.0
 
 import org.kde.quickcharts 1.0 as Charts
 import org.kde.quickcharts.controls 1.0 as ChartsControls
 
 ChartsControls.Legend {
     id: legend
 
     property alias sensorIds: sensorsRepeater.model
     property var sourceModel
     property var colorSource
 
     flow: GridLayout.TopToBottom
 
     Layout.maximumHeight: implicitHeight
     Layout.maximumWidth: parent.width
 
     spacing: Kirigami.Units.smallSpacing
 
     valueVisible: true
-    valueWidth: units.gridUnit * 2
+    valueWidth: Kirigami.Units.gridUnit * 2
     formatValue: function(input, index) {
+        if (!sourceModel) {
+            return input
+        }
+
         return Formatter.formatValueShowNull(input, sourceModel.data(sourceModel.index(0, index), SensorDataModel.Unit))
     }
 
     Repeater {
         id: sensorsRepeater
         delegate: ChartsControls.LegendDelegate {
             name: sensor.name
             shortName: sensor.shortName
             value: sensor.formattedValue || ""
             colorVisible: false
 
             layoutWidth: legend.width
-            valueWidth: units.gridUnit * 2
+            valueWidth: Kirigami.Units.gridUnit * 2
 
             Sensor {
                 id: sensor
                 sensorId: modelData
             }
         }
     }
 }