diff --git a/BUILD.bazel b/BUILD.bazel
index 51a70578..725d7784 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -375,11 +375,14 @@ cc_test(
     srcs = ["gemma/tensor_info_test.cc"],
     deps = [
         ":configs",
+        ":gemma_args",
         ":mat",
         ":tensor_info",
+        ":threading_context",
         ":weights",
         "@googletest//:gtest_main",  # buildcleaner: keep
         "//compression:compress",
+        "//compression:types",
         "@highway//:hwy",  # aligned_allocator.h
     ],
 )
diff --git a/gemma/gemma-inl.h b/gemma/gemma-inl.h
index 5c78ba84..ab2ed8ce 100644
--- a/gemma/gemma-inl.h
+++ b/gemma/gemma-inl.h
@@ -149,8 +149,8 @@ HWY_NOINLINE void ActivationBatched(
     ActivationType activation, Mat1& c1, const Mat2* c2, ThreadingContext& ctx,
     size_t cluster_idx = 0,
     Parallelism parallelism = Parallelism::kFlat) {
-  HWY_DASSERT(c1.SameShape(*c2));
   if (c2 && c2->HasPtr()) {
+    HWY_DASSERT(c1.SameShape(*c2));
     ParallelFor(parallelism, c1.Rows(), ctx, cluster_idx,
                 Callers::kActivationBatched, [&](uint64_t task, size_t worker) {
                   Activation(activation, c1.Row(task), c2->Row(task), c1.Cols(),
diff --git a/gemma/gemma.cc b/gemma/gemma.cc
index 0dd2b2eb..cec3bce0 100644
--- a/gemma/gemma.cc
+++ b/gemma/gemma.cc
@@ -233,7 +233,7 @@ static HWY_INLINE void EmbedTokenFromWeights(int token, size_t x_row,
                                              MatStorageT<float>& x) {
   const size_t model_dim = model_config.model_dim;
   // Qwen3/DeepSeekV4 does not scale embeddings by sqrt(model_dim).
-  const float emb_scaling =
+  float emb_scaling =
       HasEmbeddingScaling(model_config) ? EmbeddingScaling(model_dim) : 1.0f;
   HWY_DASSERT(token >= 0);
   HWY_DASSERT(token < static_cast<int>(model_config.vocab_size));
diff --git a/gemma/tensor_info_test.cc b/gemma/tensor_info_test.cc
index 3bde4391..e0ae3a28 100644
--- a/gemma/tensor_info_test.cc
+++ b/gemma/tensor_info_test.cc
@@ -2,11 +2,16 @@
 
 #include <stdio.h>
 
+#include <vector>
+
 #include "gtest/gtest.h"
+#include "compression/compress-inl.h"
 #include "compression/types.h"  // SfpStream
 #include "gemma/configs.h"
+#include "gemma/gemma_args.h"
 #include "gemma/weights.h"
 #include "util/mat.h"
+#include "util/threading_context.h"
 #include "hwy/base.h"  // HWY_ASSERT_M
 
 namespace gcpp {