diff --git a/CodenameOne/src/com/codename1/impl/CodenameOneImplementation.java b/CodenameOne/src/com/codename1/impl/CodenameOneImplementation.java
index fdf95ad3cb..de8201da27 100644
--- a/CodenameOne/src/com/codename1/impl/CodenameOneImplementation.java
+++ b/CodenameOne/src/com/codename1/impl/CodenameOneImplementation.java
@@ -2680,7 +2680,7 @@ protected boolean hasDragStarted(final int x, final int y) {
                 break;
             case Component.DRAG_REGION_POSSIBLE_DRAG_X:
                 startY = Math.max(5, startY);
-                startX = Math.min(startY, 2f);
+                startX = Math.min(startX, 2f);
                 break;
             case Component.DRAG_REGION_POSSIBLE_DRAG_Y:
                 startX = Math.max(5, startX);
diff --git a/CodenameOne/src/com/codename1/ui/util/UIBuilder.java b/CodenameOne/src/com/codename1/ui/util/UIBuilder.java
index 608feac8ff..50591dff18 100644
--- a/CodenameOne/src/com/codename1/ui/util/UIBuilder.java
+++ b/CodenameOne/src/com/codename1/ui/util/UIBuilder.java
@@ -230,7 +230,7 @@ public static void setBlockAnalytics(boolean aBlockAnalytics) {
         blockAnalytics = aBlockAnalytics;
     }
 
-    static Hashtable getComponentRegistry() {
+    static synchronized Hashtable getComponentRegistry() {
         if (componentRegistry == null) {
             componentRegistry = new Hashtable();
             componentRegistry.put("Button", Button.class);