diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bfebbfd..379022e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,11 +43,12 @@ jobs:
           - { title: "no-deprecated"   , os: "ubuntu-latest" , cc: "clang"   , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_DEPRECATED=1" }
           - { title: "no-intrinsics"   , os: "ubuntu-latest" , cc: "clang"   , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_INTRINSICS=1" }
           - { title: "no-logging"      , os: "ubuntu-latest" , cc: "clang"   , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_LOGGING=1" }
+          - { title: "no-logging-text" , os: "ubuntu-latest" , cc: "clang"   , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_LOGGING=1,ASMJIT_NO_TEXT=1" }
           - { title: "no-builder"      , os: "ubuntu-latest" , cc: "clang"   , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_BUILDER=1" }
           - { title: "no-compiler"     , os: "ubuntu-latest" , cc: "clang"   , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_COMPILER=1" }
           - { title: "no-jit"          , os: "ubuntu-latest" , cc: "clang"   , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_JIT=1" }
-          - { title: "no-introspection", os: "ubuntu-latest" , cc: "clang"   , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_INTROSPECTI1=1" }
-          - { title: "no-validation"   , os: "ubuntu-latest" , cc: "clang"   , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_VALIDATI1=1" }
+          - { title: "no-introspection", os: "ubuntu-latest" , cc: "clang"   , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_INTROSPECTION=1" }
+          - { title: "no-validation"   , os: "ubuntu-latest" , cc: "clang"   , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_VALIDATION=1" }
           - { title: "no-x86"          , os: "ubuntu-latest" , cc: "clang"   , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_X86=1" }
           - { title: "no-aarch64"      , os: "ubuntu-latest" , cc: "clang"   , arch: "x64", build_type: "Release", defs: "ASMJIT_TEST=1,ASMJIT_NO_AARCH64=1" }
 
diff --git a/src/asmjit/arm/a64compiler.h b/src/asmjit/arm/a64compiler.h
index bed408a..4845235 100644
--- a/src/asmjit/arm/a64compiler.h
+++ b/src/asmjit/arm/a64compiler.h
@@ -55,7 +55,7 @@ public:
       _newRegFmt(&reg, type, s, std::forward<Args>(args)...);
     return reg;
 #else
-    DebugUtils::unused(std::forward<Args>(args)...);
+    DebugUtils::unused(s, std::forward<Args>(args)...);
     RegT reg(Globals::NoInit);
     _newReg(&reg, type, nullptr);
     return reg;
diff --git a/src/asmjit/arm/a64instdb.cpp b/src/asmjit/arm/a64instdb.cpp
index 49be360..5d04b71 100644
--- a/src/asmjit/arm/a64instdb.cpp
+++ b/src/asmjit/arm/a64instdb.cpp
@@ -1843,7 +1843,7 @@ const InstDB::CommonInfo InstDB::commonData[] = {
 // ArmUtil - Id <-> Name
 // =====================
 
-#ifndef ASMJIT_DISABLE_TEXT
+#ifndef ASMJIT_NO_TEXT
 // ${NameData:Begin}
 // ------------------- Automatically generated, do not edit -------------------
 const uint32_t InstDB::_instNameIndexTable[] = {
@@ -2650,7 +2650,7 @@ const InstDB::InstNameIndex InstDB::instNameIndex[26] = {
 };
 // ----------------------------------------------------------------------------
 // ${NameData:End}
-#endif
+#endif // !ASMJIT_NO_TEXT
 
 ASMJIT_END_SUB_NAMESPACE
 
diff --git a/src/asmjit/x86/x86instapi.cpp b/src/asmjit/x86/x86instapi.cpp
index 174b3bb..d614973 100644
--- a/src/asmjit/x86/x86instapi.cpp
+++ b/src/asmjit/x86/x86instapi.cpp
@@ -1686,6 +1686,7 @@ static Error queryFeaturesInline(CpuFeatures* out, Arch arch, BaseInst inst, Arg
   return InstInternal::queryFeatures(arch, inst, opArray, sizeof...(args), out);
 }
 
+#ifndef ASMJIT_NO_TEXT
 UNIT(x86_inst_api_text) {
   // All known instructions should be matched.
   INFO("Matching all X86 instructions");
@@ -1701,6 +1702,7 @@ UNIT(x86_inst_api_text) {
       .message("Instructions do not match \"%s\" (#%u) != \"%s\" (#%u)", aName.data(), a, bName.data(), b);
   }
 }
+#endif // !ASMJIT_NO_TEXT
 
 UNIT(x86_inst_api_cpu_features) {
   INFO("Verifying whether SSE2+ features are reported correctly for legacy instructions");