diff --git a/build.gradle.kts b/build.gradle.kts
index e7c40cf7..8d882549 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -113,7 +113,7 @@ enum class Artifact(
 
     fun nativeFileName(platform: NativePlatform): String? {
         return if (nativeBinding == null) null
-        else "$nativeBinding/${platform.osFamilyName}/${platform.osArch}/${platform.nativeLibPrefix}${nativeBinding.basename}${platform.nativeLibSuffix}"
+        else "${nativeBinding.bindingName}/${platform.osFamilyName}/${platform.osArch}/${platform.nativeLibPrefix}${nativeBinding.basename}${platform.nativeLibSuffix}"
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 033e24c4..7f93135c 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradlew b/gradlew
index fcb6fca1..0adc8e1a 100644
--- a/gradlew
+++ b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/modules/overrungl.core/src/main/java/overrungl/internal/Exceptions.java b/modules/overrungl.core/src/main/java/overrungl/internal/Exceptions.java
index 54e12662..7bfd1fd7 100644
--- a/modules/overrungl.core/src/main/java/overrungl/internal/Exceptions.java
+++ b/modules/overrungl.core/src/main/java/overrungl/internal/Exceptions.java
@@ -34,4 +34,8 @@ public final class Exceptions {
      */
     public static final StringTemplate.Processor<IllegalArgumentException, RuntimeException> IAE = stringTemplate ->
         new IllegalArgumentException(stringTemplate.interpolate());
+
+    private Exceptions() {
+        //no instance
+    }
 }
diff --git a/modules/overrungl.core/src/main/java/overrungl/internal/RuntimeHelper.java b/modules/overrungl.core/src/main/java/overrungl/internal/RuntimeHelper.java
index 00c87c5f..d21b38a0 100644
--- a/modules/overrungl.core/src/main/java/overrungl/internal/RuntimeHelper.java
+++ b/modules/overrungl.core/src/main/java/overrungl/internal/RuntimeHelper.java
@@ -174,14 +174,12 @@ public static SymbolLookup load(String module, String basename, String version)
             var libFile = new File(file, STR. "\{ basename }-\{ version }\{ suffix }" );
             if (!libFile.exists()) {
                 // Extract
-                try (var is = STACK_WALKER.getCallerClass().getClassLoader().getResourceAsStream(
-                    STR. "\{ module }/\{ os.familyName() }/\{ Architecture.current() }/\{ path }"
-                )) {
-                    Files.copy(Objects.requireNonNull(is), Path.of(libFile.getAbsolutePath()));
+                final String fromPath = STR. "\{ module }/\{ os.familyName() }/\{ Architecture.current() }/\{ path }" ;
+                try (var is = STACK_WALKER.getCallerClass().getClassLoader().getResourceAsStream(fromPath)) {
+                    Files.copy(Objects.requireNonNull(is, STR. "File not found: \{ fromPath }" ),
+                        Path.of(libFile.getAbsolutePath()));
                 } catch (Exception e) {
-                    var exception = new IllegalStateException(STR. "File not found: \{ file }; try setting property -Doverrungl.natives to a valid path" );
-                    exception.addSuppressed(e);
-                    throw exception;
+                    throw new IllegalStateException(STR. "File not found: \{ file }; try setting property -Doverrungl.natives to a valid path" , e);
                 }
             }
             uri = libFile.toURI();