diff --git a/resource/web/event_overview.tmpl b/resource/web/event_overview.tmpl
index f1850028..8710d26c 100755
--- a/resource/web/event_overview.tmpl
+++ b/resource/web/event_overview.tmpl
@@ -17,7 +17,7 @@
                 <tr>
                     <td><a href="?id={{.getId()}}">{{.getName()}}</a></td>
                     <td>{{.getDeviceData().getClass().getSimpleName()}}</td>
-                    <td>{{.getDeviceData().getData()}}</td>
+                    <td>{{.getDeviceData()}}</td>
                     <td><span class="timestamp">{{.getDeviceData().getTimestamp()}}</span></td>
                     <td>
                         <form method="POST">
diff --git a/resource/web/sensor_overview.tmpl b/resource/web/sensor_overview.tmpl
index c6e315c8..e0ab9a52 100755
--- a/resource/web/sensor_overview.tmpl
+++ b/resource/web/sensor_overview.tmpl
@@ -16,7 +16,7 @@
                 <tr>
                     <td><a href="?id={{.getId()}}">{{.getName()}}</a></td>
                     <td>{{.getDeviceData().getClass().getSimpleName()}}</td>
-                    <td>{{.getDeviceData().getData()}}</td>
+                    <td>{{.getDeviceData()}}</td>
                     <td><span class="timestamp">{{.getDeviceData().getTimestamp()}}</span></td>
                 </tr>
                 {{/sensors}}
diff --git a/src/se/hal/plugin/nutups/NutUpsDevice.java b/src/se/hal/plugin/nutups/NutUpsDevice.java
index f83c6d5a..995495c5 100755
--- a/src/se/hal/plugin/nutups/NutUpsDevice.java
+++ b/src/se/hal/plugin/nutups/NutUpsDevice.java
@@ -49,7 +49,7 @@ public class NutUpsDevice implements HalSensorConfig{
     }
 
     public String toString(){
-        return "id: "+ upsId;
+        return "upsId: "+ upsId;
     }
 
     @Override