diff --git a/hal-core/src/se/hal/page/EventOverviewWebPage.java b/hal-core/src/se/hal/page/EventOverviewWebPage.java
index b7dcfd8c..02ac8304 100644
--- a/hal-core/src/se/hal/page/EventOverviewWebPage.java
+++ b/hal-core/src/se/hal/page/EventOverviewWebPage.java
@@ -16,6 +16,7 @@ import zutil.parser.Templator;
 
 import java.sql.PreparedStatement;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -76,8 +77,8 @@ public class EventOverviewWebPage extends HalWebPage {
             return tmpl;
         }
         else {
-            Event[] events = Event.getLocalEvents(db).toArray(new Event[0]);
-            Arrays.sort(events, DeviceNameComparator.getInstance());
+            List<Event> events = Event.getLocalEvents(db);
+            Collections.sort(events, DeviceNameComparator.getInstance());
 
             Templator tmpl = new Templator(FileUtil.find(OVERVIEW_TEMPLATE));
             tmpl.set("events", events);
diff --git a/hal-core/src/se/hal/page/SensorOverviewWebPage.java b/hal-core/src/se/hal/page/SensorOverviewWebPage.java
index 408a3d77..b69ec22b 100644
--- a/hal-core/src/se/hal/page/SensorOverviewWebPage.java
+++ b/hal-core/src/se/hal/page/SensorOverviewWebPage.java
@@ -13,6 +13,7 @@ import zutil.parser.Templator;
 
 import java.sql.PreparedStatement;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -53,8 +54,8 @@ public class SensorOverviewWebPage extends HalWebPage {
             tmpl.set("history", history);
             return tmpl;
         } else {
-            Sensor[] sensors = Sensor.getLocalSensors(db).toArray(new Sensor[0]);
-            Arrays.sort(sensors, DeviceNameComparator.getInstance());
+            List<Sensor> sensors = Sensor.getLocalSensors(db);
+            Collections.sort(sensors, DeviceNameComparator.getInstance());
 
             Templator tmpl = new Templator(FileUtil.find(OVERVIEW_TEMPLATE));
             tmpl.set("sensors", sensors);