diff --git a/src/main/java/de/neemann/digital/gui/components/EditorFactory.java b/src/main/java/de/neemann/digital/gui/components/EditorFactory.java
index 2b34b2f5b..49caf7601 100644
--- a/src/main/java/de/neemann/digital/gui/components/EditorFactory.java
+++ b/src/main/java/de/neemann/digital/gui/components/EditorFactory.java
@@ -97,15 +97,18 @@ public final class EditorFactory {
     }
 
     private final static class IntegerEditor extends LabelEditor<Integer> {
+        private static final Integer[] DEFAULTS = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
         private final JComboBox<Integer> comboBox;
         private final Key<Integer> key;
 
         public IntegerEditor(Integer value, Key<Integer> key) {
             this.key = key;
-            Integer[] selects = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
+            Integer[] selects = null;
             if (key instanceof Key.KeyInteger) {
                 selects = ((Key.KeyInteger) key).getComboBoxValues();
             }
+            if (selects == null)
+                selects = DEFAULTS;
             comboBox = new JComboBox<>(selects);
             comboBox.setEditable(true);
             comboBox.setSelectedItem(value);
diff --git a/src/main/java/de/neemann/digital/gui/components/data/DummyElement.java b/src/main/java/de/neemann/digital/gui/components/data/DummyElement.java
index 1bfb4f59a..6b61948eb 100644
--- a/src/main/java/de/neemann/digital/gui/components/data/DummyElement.java
+++ b/src/main/java/de/neemann/digital/gui/components/data/DummyElement.java
@@ -19,7 +19,7 @@ public class DummyElement implements Element {
     /**
      * The DataElement description
      */
-    public static final ElementTypeDescription DATADESCRIPTION = new ElementTypeDescription("DATA", DummyElement.class)
+    public static final ElementTypeDescription DATADESCRIPTION = new ElementTypeDescription("Data", DummyElement.class)
             .addAttribute(Keys.MICRO_STEP)
             .addAttribute(Keys.MAX_STEP_COUNT);