diff --git a/platform-independent/c/core/Dockerfile.x86_64 b/platform-independent/c/core/Dockerfile
similarity index 100%
rename from platform-independent/c/core/Dockerfile.x86_64
rename to platform-independent/c/core/Dockerfile
diff --git a/platform-independent/c/core/Dockerfile.x86 b/platform-independent/c/core/Dockerfile.x86
deleted file mode 100644
index c07c9c30..00000000
--- a/platform-independent/c/core/Dockerfile.x86
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM i386/debian:stable-slim
-ENTRYPOINT ["linux32", "--"]
-
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199
-RUN mkdir -p /usr/share/man/man1
-
-RUN apt-get update && apt-get install -y default-jdk-headless git-core bash libtool automake autoconf make g++
-RUN git clone --depth=3 $(: --shallow-submodules) --recurse-submodules --branch rewrite https://gitlab.com/MasterPassword/MasterPassword.git /mpw
-RUN cd /mpw && git log -1 && ./gradlew -i clean build
diff --git a/platform-independent/c/core/build.gradle b/platform-independent/c/core/build.gradle
index 4dd47136..82ea8d33 100644
--- a/platform-independent/c/core/build.gradle
+++ b/platform-independent/c/core/build.gradle
@@ -16,7 +16,7 @@ artifacts {
         components.withType( ComponentWithRuntimeFile ) {
             if (optimized)
                 from runtimeFile, {
-                    into targetMachine.getOperatingSystemFamily().getName() + '/' + targetMachine.getArchitecture().getName()
+                    into targetMachine.getOperatingSystemFamily().getName() + '/' + targetMachine.getArchitecture().getName().replace('-', '_')
                 }
         }
     }
@@ -54,31 +54,30 @@ library {
         }
     }
 
-    components.withType( CppComponent ) {
-        binaries.whenElementFinalized {
-            project.dependencies {
-                def system = targetMachine.getOperatingSystemFamily().getName()
+    binaries.configureEach( CppBinary ) {
+        dependencies {
+            def arch = targetMachine.getArchitecture().getName().replace('-', '_')
+            def system = targetMachine.getOperatingSystemFamily().getName()
 
-                // libsodium
-                archive.dependsOn project.tasks.maybeCreate( "build_libsodium-${system}", Exec ).configure {
-                    commandLine 'bash', "$rootDir/lib/bin/build_libsodium-${system}"
-                    privateHeaders.from "$rootDir/lib/libsodium/build-${system}~/out/include"
-                    add( linkLibraries.name, fileTree( "$rootDir/lib/libsodium/build-${system}~/out/lib" ) )
-                }
-                clean.dependsOn project.tasks.maybeCreate( "clean_libsodium-${system}", Exec ).configure {
-                    commandLine 'bash', "$rootDir/lib/bin/build_libsodium-${system}", 'clean'
-                }
-
-                // libjson-c
-                /*archive.dependsOn project.tasks.maybeCreate( "build_libjson-c-${system}", Exec ).configure {
-                    commandLine 'bash', "$rootDir/lib/bin/build_libjson-c-${system}"
-                    privateHeaders.from "$rootDir/lib/libjson-c/build-${system}~/out/include"
-                    add( linkLibraries.name, fileTree( "$rootDir/lib/libjson-c/build-${system}~/out/lib" ) )
-                }
-                clean.dependsOn project.tasks.maybeCreate( "clean_libjson-c-${system}", Exec ).configure {
-                    commandLine 'bash', "$rootDir/lib/bin/build_libjson-c-${system}", 'clean'
-                }*/
+            // libsodium
+            archive.dependsOn project.tasks.maybeCreate( "build_libsodium-${system}", Exec ).configure {
+                commandLine 'bash', "$rootDir/lib/bin/build_libsodium-${system}"
+                privateHeaders.from "$rootDir/lib/libsodium/build-${system}~/out/include"
+                implementation fileTree( "$rootDir/lib/libsodium/build-${system}~/out/lib/${arch}" )
             }
+            clean.dependsOn project.tasks.maybeCreate( "clean_libsodium-${system}", Exec ).configure {
+                commandLine 'bash', "$rootDir/lib/bin/build_libsodium-${system}", 'clean'
+            }
+
+            // libjson-c
+            /*archive.dependsOn project.tasks.maybeCreate( "build_libjson-c-${system}", Exec ).configure {
+                commandLine 'bash', "$rootDir/lib/bin/build_libjson-c-${system}"
+                privateHeaders.from "$rootDir/lib/libjson-c/build-${system}~/out/include"
+                add( linkLibraries.name, fileTree( "$rootDir/lib/libjson-c/build-${system}~/out/lib" ) )
+            }
+            clean.dependsOn project.tasks.maybeCreate( "clean_libjson-c-${system}", Exec ).configure {
+                commandLine 'bash', "$rootDir/lib/bin/build_libjson-c-${system}", 'clean'
+            }*/
         }
     }
 }
diff --git a/platform-independent/c/core/lib/linux/x86/libmpw.so b/platform-independent/c/core/lib/linux/x86/libmpw.so
deleted file mode 100755
index 13b37cc5..00000000
Binary files a/platform-independent/c/core/lib/linux/x86/libmpw.so and /dev/null differ
diff --git a/platform-independent/c/core/lib/linux/x86_64/libmpw.so b/platform-independent/c/core/lib/linux/x86_64/libmpw.so
deleted file mode 100755
index 43a07d04..00000000
Binary files a/platform-independent/c/core/lib/linux/x86_64/libmpw.so and /dev/null differ
diff --git a/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/Native.java b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/Native.java
index fdc6ffc9..1f9be15b 100644
--- a/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/Native.java
+++ b/platform-independent/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/Native.java
@@ -201,11 +201,5 @@ public final class Native {
 
             return x86;
         }
-
-
-        @Override
-        public String toString() {
-            return name().replace('_', '-' );
-        }
     }
 }