diff --git a/config.sh b/config.sh
index c73a75a0082..87acb63f888 100644
--- a/config.sh
+++ b/config.sh
@@ -20,3 +20,4 @@ fi
 
 export RUSTFLAGS='-Zalways-encode-mir -Cpanic=abort -Cdebuginfo=2 -Zcodegen-backend='$(pwd)'/target/'$channel'/librustc_codegen_cranelift.'$dylib_ext
 RUSTC="rustc $RUSTFLAGS -L crate=target/out --out-dir target/out"
+export RUST_LOG=warn # display metadata load errors
diff --git a/patches/0013-Patch-away-bswap-usage.patch b/patches/0013-Patch-away-bswap-usage.patch
index 14d05a32583..e29042c7297 100644
--- a/patches/0013-Patch-away-bswap-usage.patch
+++ b/patches/0013-Patch-away-bswap-usage.patch
@@ -16,7 +16,7 @@ index f928d40..6a146f5 100644
              #[inline]
              pub const fn swap_bytes(self) -> Self {
 -                intrinsics::bswap(self as $ActualT) as Self
-+                0 // bswap is unsupported by cg_clif
++                42 // bswap is unsupported by cg_clif
              }
          }
  
diff --git a/src/common.rs b/src/common.rs
index 3e51d1e6904..869cacca87b 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -396,8 +396,8 @@ impl<'a, 'tcx: 'a> CPlace<'tcx> {
                 dst_layout,
             ),
             CPlace::NoPlace(layout) => {
-                assert!(layout.size.bytes() == 0);
-                assert!(from.layout().size.bytes() == 0);
+                assert_eq!(layout.size.bytes(), 0);
+                assert_eq!(from.layout().size.bytes(), 0);
                 return;
             }
             CPlace::Addr(_, _, _) => bug!("Can't write value to unsized place {:?}", self),