diff --git a/src/org/violetlib/jnr/aqua/ScrollBarThumbLayoutConfiguration.java b/src/org/violetlib/jnr/aqua/ScrollBarThumbLayoutConfiguration.java
index b656745..fb8a18c 100644
--- a/src/org/violetlib/jnr/aqua/ScrollBarThumbLayoutConfiguration.java
+++ b/src/org/violetlib/jnr/aqua/ScrollBarThumbLayoutConfiguration.java
@@ -65,13 +65,13 @@ public boolean equals(@Nullable Object o)
             return false;
         }
         ScrollBarThumbLayoutConfiguration that = (ScrollBarThumbLayoutConfiguration) o;
-        return value == that.value;
+        return value == that.value && Float.compare(thumbExtent, that.thumbExtent) == 0;
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(super.hashCode(), value);
+        return Objects.hash(super.hashCode(), value, thumbExtent);
     }
 
     @Override
diff --git a/src/org/violetlib/jnr/aqua/coreui/CoreUIPainter.java b/src/org/violetlib/jnr/aqua/coreui/CoreUIPainter.java
index a2da84a..bf8f192 100644
--- a/src/org/violetlib/jnr/aqua/coreui/CoreUIPainter.java
+++ b/src/org/violetlib/jnr/aqua/coreui/CoreUIPainter.java
@@ -17,6 +17,7 @@
 
 import java.awt.geom.Rectangle2D;
 import java.security.PrivilegedAction;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -778,11 +779,11 @@ STATE_KEY, toState(st),
               PRESENTATION_STATE_KEY, toPresentationState(st),
               USER_INTERFACE_LAYOUT_DIRECTION_KEY, toLayoutDirection(ld));
         } else {
-            List<Object> parameters = Arrays.asList(WIDGET_KEY, widget,
+            List<Object> parameters = new ArrayList<>(Arrays.asList(WIDGET_KEY, widget,
               SIZE_KEY, toSize(sz),
               STATE_KEY, toState(st),
               PRESENTATION_STATE_KEY, toPresentationState(st),
-              USER_INTERFACE_LAYOUT_DIRECTION_KEY, toLayoutDirection(ld));
+              USER_INTERFACE_LAYOUT_DIRECTION_KEY, toLayoutDirection(ld)));
             parameters.addAll(extraParameters);
             r = getRenderer(parameters.toArray());
         }
diff --git a/src/org/violetlib/jnr/aqua/impl/LayoutInfo_11.java b/src/org/violetlib/jnr/aqua/impl/LayoutInfo_11.java
index 2f29098..4108ca5 100644
--- a/src/org/violetlib/jnr/aqua/impl/LayoutInfo_11.java
+++ b/src/org/violetlib/jnr/aqua/impl/LayoutInfo_11.java
@@ -274,7 +274,7 @@ public LayoutInfo_11()
     public @NotNull Insetter getPopupButtonContentInsets(@NotNull PopupButtonLayoutConfiguration g)
     {
         PopupButtonWidget bw = g.getPopupButtonWidget();
-        if (bw == BUTTON_POP_UP || bw == BUTTON_POP_DOWN | bw == BUTTON_POP_UP_TEXTURED | bw == BUTTON_POP_DOWN_TEXTURED) {
+        if (bw == BUTTON_POP_UP || bw == BUTTON_POP_DOWN || bw == BUTTON_POP_UP_TEXTURED || bw == BUTTON_POP_DOWN_TEXTURED) {
             Size sz = g.getSize();
             float top = 1;
             float bottom = 1;
diff --git a/src/org/violetlib/jnr/impl/JNRUtils.java b/src/org/violetlib/jnr/impl/JNRUtils.java
index 6d3fe0e..53cce43 100644
--- a/src/org/violetlib/jnr/impl/JNRUtils.java
+++ b/src/org/violetlib/jnr/impl/JNRUtils.java
@@ -342,7 +342,7 @@ public static boolean describeRaster(@NotNull int[] buffer, int rw, int rh)
         }
         if (opaquePixelCount > 0) {
             int percent = Math.round(opaquePixelCount * 100f / pixelCount);
-            s += " " + transparentPixelCount + " opaque pixels (" + percent + "%)";
+            s += " " + opaquePixelCount + " opaque pixels (" + percent + "%)";
         }
         if (maximumAlpha > 0) {
             s += " maximum alpha: " + maximumAlpha + " at " + maximumAlphaCol + ", " + maximumAlphaRow;