diff --git a/src/main/java/de/neemann/digital/draw/builder/Builder.java b/src/main/java/de/neemann/digital/draw/builder/Builder.java
index 6d7c6ae28..446b8956b 100644
--- a/src/main/java/de/neemann/digital/draw/builder/Builder.java
+++ b/src/main/java/de/neemann/digital/draw/builder/Builder.java
@@ -277,7 +277,9 @@ public class Builder {
         VisualElement clock = new VisualElement(Clock.DESCRIPTION.getName())
                 .setShapeFactory(shapeFactory)
                 .setPos(new Vector(x, yMin - SIZE * 3));
-        clock.getElementAttributes().set(Keys.ROTATE, new Rotation(3));
+        clock.getElementAttributes()
+                .set(Keys.ROTATE, new Rotation(3))
+                .set(Keys.RUN_AT_REAL_TIME, true);
         circuit.add(clock);
     }
 
diff --git a/src/main/java/de/neemann/digital/gui/components/table/TableDialog.java b/src/main/java/de/neemann/digital/gui/components/table/TableDialog.java
index 137059b41..ee595b210 100644
--- a/src/main/java/de/neemann/digital/gui/components/table/TableDialog.java
+++ b/src/main/java/de/neemann/digital/gui/components/table/TableDialog.java
@@ -251,8 +251,9 @@ public class TableDialog extends JDialog {
         int cols = model.getTable().getVars().size();
         reorderMenu.add(new JMenuItem(new ReorderAction(cols)));
         for (int i = 0; i < cols - 1; i++) {
-            reorderMenu.add(new JMenuItem(new ReorderAction(cols, i)));
+            reorderMenu.add(new JMenuItem(new ReorderAction(cols, i, i + 1)));
         }
+        reorderMenu.add(new JMenuItem(new ReorderAction(cols, cols - 1, 0)));
         calculateExpressions();
     }
 
@@ -367,15 +368,15 @@ public class TableDialog extends JDialog {
                 swap[cols - i - 1] = i;
         }
 
-        private ReorderAction(int cols, int swapIndex) {
-            super(Lang.get("menu_table_swap_N1_N2", swapIndex, swapIndex + 1));
+        private ReorderAction(int cols, int swapIndex1, int swapIndex2) {
+            super(Lang.get("menu_table_swap_N1_N2", swapIndex1, swapIndex2));
             swap = new int[cols];
             for (int i = 0; i < cols; i++)
                 swap[i] = i;
 
-            int z = swap[swapIndex];
-            swap[swapIndex] = swap[swapIndex + 1];
-            swap[swapIndex + 1] = z;
+            int z = swap[swapIndex1];
+            swap[swapIndex1] = swap[swapIndex2];
+            swap[swapIndex2] = z;
         }
 
         @Override