diff --git a/ortools/util/bitset.h b/ortools/util/bitset.h
index 9c602fd0f3..a67d7a74d1 100644
--- a/ortools/util/bitset.h
+++ b/ortools/util/bitset.h
@@ -324,7 +324,7 @@ inline uint32_t IntervalDown32(uint32_t s) {
 }
 
 // ----- Bitset operators -----
-// Bitset: array of uint32_t/uint64_t words
+// Bitset: array of uint32_t/uint64 words
 
 // Bit operators used to manipulates bitsets.
 
diff --git a/ortools/util/fp_utils.cc b/ortools/util/fp_utils.cc
index bf82c1dca4..e44d20cd56 100644
--- a/ortools/util/fp_utils.cc
+++ b/ortools/util/fp_utils.cc
@@ -72,9 +72,9 @@ void ComputeScalingErrors(absl::Span<const double> input,
 }
 
 template <bool use_bounds>
-void GetBestScalingOfDoublesToInt64(const std::vector<double>& input,
-                                    const std::vector<double>& lb,
-                                    const std::vector<double>& ub,
+void GetBestScalingOfDoublesToInt64(absl::Span<const double> input,
+                                    absl::Span<const double> lb,
+                                    absl::Span<const double> ub,
                                     int64_t max_absolute_sum,
                                     double* scaling_factor) {
   const double kInfinity = std::numeric_limits<double>::infinity();
diff --git a/ortools/util/java/functions.i b/ortools/util/java/functions.i
index 3c7d41cc5e..e537b170b4 100644
--- a/ortools/util/java/functions.i
+++ b/ortools/util/java/functions.i
@@ -74,7 +74,7 @@
                                    __Unused__, Args...)
 // The macro expansions can be hard to follow, so we show an example of the
 // expected macro expansion with: ReturnType=int64_t, Args=int64_t, bool.
-// EXPANSION EXAMPLE: "int64_t(int64_t, bool)".
+// EXPANSION EXAMPLE: "int64(int64_t, bool)".
 %typemap(in) std::function<PARENTHIZE(ReturnType, Args)> {
   jclass object_class = jenv->FindClass(ClassPath ClassName);
   if (nullptr == object_class) return $null;
@@ -84,7 +84,7 @@
   operations_research::swig_util::CppClass* const fun =
       reinterpret_cast<operations_research::swig_util::CppClass*>(
           jenv->CallStaticLongMethod(object_class, method_id, $input));
-  // EXPANSION EXAMPLE: "int64_t i0, bool i1".
+  // EXPANSION EXAMPLE: "int64 i0, bool i1".
   $1 = [fun](INSERT_NAMES(NumArgs)(Args))  {
     // EXPANSION EXAMPLE: "i0, i1".
     return fun->Run(NAMES(NumArgs));