diff --git a/build.gradle b/build.gradle
index d563cde0..b193cfbc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,5 @@
 import org.gradle.internal.jvm.Jvm
 
-
-
 plugins {
     id 'com.github.johnrengelman.shadow' version '5.1.0'
     id 'java'
@@ -15,7 +13,7 @@ repositories {
     mavenLocal()
     mavenCentral()
     maven {
-        url = 'http://repo.maven.apache.org/maven2'
+        url = 'https://repo.maven.apache.org/maven2'
     }
 }
 
@@ -50,7 +48,7 @@ publishing {
             customizePom(pom)
             groupId = 'com.github.weisj'
             artifactId 'darklaf'
-            version = '1.3.1.1'
+            version = '1.3.1.2'
 
             from components.java
 
diff --git a/src/main/java/com/github/weisj/darklaf/ui/button/DarkButtonUI.java b/src/main/java/com/github/weisj/darklaf/ui/button/DarkButtonUI.java
index a5d56a27..74b2ab6c 100644
--- a/src/main/java/com/github/weisj/darklaf/ui/button/DarkButtonUI.java
+++ b/src/main/java/com/github/weisj/darklaf/ui/button/DarkButtonUI.java
@@ -161,6 +161,7 @@ public class DarkButtonUI extends BasicButtonUI {
                     if (isFullShadow(c)) {
                         g.fillRect(0, 0, c.getWidth(), c.getHeight());
                     } else {
+                        margin.set(0, 0, 0, 0);
                         DarkUIUtil.fillRoundRect((Graphics2D) g, margin.left, margin.top,
                                                  c.getWidth() - margin.left - margin.right,
                                                  c.getHeight() - margin.top - margin.bottom, arc);
diff --git a/src/main/java/com/github/weisj/darklaf/ui/combobox/DarkComboBoxUI.java b/src/main/java/com/github/weisj/darklaf/ui/combobox/DarkComboBoxUI.java
index 51be8cd0..2639a992 100644
--- a/src/main/java/com/github/weisj/darklaf/ui/combobox/DarkComboBoxUI.java
+++ b/src/main/java/com/github/weisj/darklaf/ui/combobox/DarkComboBoxUI.java
@@ -58,7 +58,6 @@ public class DarkComboBoxUI extends BasicComboBoxUI implements Border {
     private final MouseListener mouseListener = new MouseAdapter() {
         @Override
         public void mousePressed(final MouseEvent e) {
-            super.mousePressed(e);
             comboBox.getEditor().getEditorComponent().requestFocus();
         }
     };
diff --git a/src/main/java/com/github/weisj/darklaf/ui/menu/DarkPopupMenuUI.java b/src/main/java/com/github/weisj/darklaf/ui/menu/DarkPopupMenuUI.java
index 5dccccaf..d4f9e7bd 100644
--- a/src/main/java/com/github/weisj/darklaf/ui/menu/DarkPopupMenuUI.java
+++ b/src/main/java/com/github/weisj/darklaf/ui/menu/DarkPopupMenuUI.java
@@ -107,8 +107,8 @@ public class DarkPopupMenuUI extends BasicPopupMenuUI {
             Field field = BasicPopupMenuUI.class.getDeclaredField("MOUSE_GRABBER_KEY");
             field.setAccessible(true);
             Object value = field.get(null);
-            MouseGrabber mouseGrabber = (MouseGrabber) context.get(value);
-            if (mouseGrabber != null) {
+            Object mouseGrabber = context.get(value);
+            if (mouseGrabber instanceof MouseGrabber) {
                 Method method = mouseGrabber.getClass().getDeclaredMethod("uninstall");
                 method.setAccessible(true);
                 method.invoke(mouseGrabber);