diff --git a/.github/scripts/generate-quality-report.py b/.github/scripts/generate-quality-report.py
index e97d783c14..88de0b4667 100755
--- a/.github/scripts/generate-quality-report.py
+++ b/.github/scripts/generate-quality-report.py
@@ -764,7 +764,8 @@ def main() -> None:
             "SF_SWITCH_NO_DEFAULT",
             "DM_DEFAULT_ENCODING",
             "EQ_CHECK_FOR_OPERAND_NOT_COMPATIBLE_WITH_THIS",
-            "IA_AMBIGUOUS_INVOCATION_OF_INHERITED_OR_OUTER_METHOD"
+            "IA_AMBIGUOUS_INVOCATION_OF_INHERITED_OR_OUTER_METHOD",
+            "RpC_REPEATED_CONDITIONAL_TEST"
         }
         violations = [
             f for f in spotbugs.findings
diff --git a/CodenameOne/src/com/codename1/components/ImageViewer.java b/CodenameOne/src/com/codename1/components/ImageViewer.java
index 5b86fab704..ae12c803dc 100644
--- a/CodenameOne/src/com/codename1/components/ImageViewer.java
+++ b/CodenameOne/src/com/codename1/components/ImageViewer.java
@@ -307,7 +307,7 @@ public void keyReleased(int key) {
                 new AnimatePanX(-1, getImageLeft(), getImageLeftPos());
                 return;
             }
-            if (gk == Display.GAME_RIGHT || gk == Display.GAME_RIGHT && (cycleRight || swipeableImages.getSelectedIndex() < getImageRightPos())) {
+            if (gk == Display.GAME_RIGHT && (cycleRight || swipeableImages.getSelectedIndex() < getImageRightPos())) {
                 new AnimatePanX(2, getImageRight(), getImageRightPos());
             }
         }
diff --git a/CodenameOne/src/com/codename1/ui/Container.java b/CodenameOne/src/com/codename1/ui/Container.java
index c41ed0cd4f..13da5d6167 100644
--- a/CodenameOne/src/com/codename1/ui/Container.java
+++ b/CodenameOne/src/com/codename1/ui/Container.java
@@ -2975,10 +2975,8 @@ public Component getComponentAt(int x, int y) {
 
             }
         }
-        if (component == null || (!component.respondsToPointerEvents() && top != null)) {
-            if (top != null) {
-                return top;
-            }
+        if (top != null && (component == null || !component.respondsToPointerEvents())) {
+            return top;
         }
 
         if (component != null) {
diff --git a/CodenameOne/src/com/codename1/ui/Form.java b/CodenameOne/src/com/codename1/ui/Form.java
index db9ce62fd2..18f36fba4e 100644
--- a/CodenameOne/src/com/codename1/ui/Form.java
+++ b/CodenameOne/src/com/codename1/ui/Form.java
@@ -1462,11 +1462,9 @@ public Container getLayeredPane(Class c, boolean top) {
             layeredPaneImpl.add(cnt);
         } else {
             if (componentCount > 0) {
-                if (componentCount > 0) {
-                    Integer z = (Integer) children.get(0).getClientProperty(Z_INDEX_PROP);
-                    if (z != null) {
-                        zIndex = z.intValue();
-                    }
+                Integer z = (Integer) children.get(0).getClientProperty(Z_INDEX_PROP);
+                if (z != null) {
+                    zIndex = z.intValue();
                 }
             }
             layeredPaneImpl.addComponent(0, cnt);
diff --git a/CodenameOne/src/com/codename1/ui/layouts/GridBagConstraints.java b/CodenameOne/src/com/codename1/ui/layouts/GridBagConstraints.java
index 3e8cead187..81cb710a28 100644
--- a/CodenameOne/src/com/codename1/ui/layouts/GridBagConstraints.java
+++ b/CodenameOne/src/com/codename1/ui/layouts/GridBagConstraints.java
@@ -170,8 +170,8 @@ void verify() throws IllegalArgumentException {
             // awt.9C=wrong value of GridBagConstraints: {0}
             throw new IllegalArgumentException("wrong value of GridBagConstraints: " + ipady); //$NON-NLS-1$ //$NON-NLS-2$
         }
-        if ((insets == null) || (insets.left < 0) || (insets.left < 0)
-                || (insets.left < 0) || (insets.left < 0)) {
+        if ((insets == null) || (insets.top < 0) || (insets.left < 0)
+                || (insets.bottom < 0) || (insets.right < 0)) {
             // awt.9C=wrong value of GridBagConstraints: {0}
             throw new IllegalArgumentException("wrong value of GridBagConstraints: " + insets); //$NON-NLS-1$ //$NON-NLS-2$
         }
diff --git a/CodenameOne/src/com/codename1/ui/plaf/CSSBorder.java b/CodenameOne/src/com/codename1/ui/plaf/CSSBorder.java
index 972382fc43..28c29fad21 100644
--- a/CodenameOne/src/com/codename1/ui/plaf/CSSBorder.java
+++ b/CodenameOne/src/com/codename1/ui/plaf/CSSBorder.java
@@ -1134,7 +1134,7 @@ public CSSBorder backgroundImage(String cssDirective) {
             if (part.indexOf("url(") == 0) {
                 part = part.substring(4, part.length() - 1);
             }
-            if (part.charAt(0) == '"' || part.charAt(0) == '"') {
+            if (part.charAt(0) == '"' || part.charAt(0) == '\'') {
                 part = part.substring(1, part.length() - 1);
             }
             if (part.indexOf("/") != -1) {