diff --git a/gemma/configs.h b/gemma/configs.h
index 38fab43..b727480 100644
--- a/gemma/configs.h
+++ b/gemma/configs.h
@@ -107,6 +107,7 @@ static inline int AttentionImplToFlags(AttentionImpl impl,
     case AttentionImpl::kOld:
       return kAttentionUseOld;
     case AttentionImpl::kFlash:
+    default:
       return 0;
   }
 }
diff --git a/gemma/gemma.cc b/gemma/gemma.cc
index 055caae..c58a5a8 100644
--- a/gemma/gemma.cc
+++ b/gemma/gemma.cc
@@ -628,7 +628,7 @@ static void GenerateTWithContinuousBatching(
   const SampleFunc sample_token =
       ChooseSampleFunc(runtime_config, engine, env.ctx);
 
-  int query_inserted = 0;
+  size_t query_inserted = 0;
   while (non_eos.Any() || query_inserted < all_queries.NumQueries()) {
     for (size_t qi = 0; qi < qbatch.Size(); ++qi) {
       // Continue if qi slot is still processing.
diff --git a/gemma/query.h b/gemma/query.h
index 9c50a06..36e8ee5 100644
--- a/gemma/query.h
+++ b/gemma/query.h
@@ -131,7 +131,7 @@ class QBatch {
     HWY_DASSERT(size_ != 0);
     HWY_DASSERT(start_ + size_ <= queries_.NumQueries());
     query_idx_.reserve(size_);
-    for (int i = 0; i < size_; ++i) {
+    for (size_t i = 0; i < size_; ++i) {
       query_idx_.push_back(start_ + i);
     }
   }