diff --git a/batched/dense/impl/KokkosBatched_Tbsv_Serial_Impl.hpp b/batched/dense/impl/KokkosBatched_Tbsv_Serial_Impl.hpp
index 75c4bd6e94..675e73f744 100644
--- a/batched/dense/impl/KokkosBatched_Tbsv_Serial_Impl.hpp
+++ b/batched/dense/impl/KokkosBatched_Tbsv_Serial_Impl.hpp
@@ -79,8 +79,8 @@ struct SerialTbsv<Uplo::Lower, Trans::NoTranspose, ArgDiag,
     if (info) return info;
 
     return SerialTbsvInternalLower<Algo::Tbsv::Unblocked>::invoke(
-        ArgDiag::use_unit_diag, A.extent(1), x.extent(0), A.data(),
-        A.stride_0(), A.stride_1(), x.data(), x.stride_0(), k);
+        ArgDiag::use_unit_diag, A.extent(1), A.data(), A.stride_0(),
+        A.stride_1(), x.data(), x.stride_0(), k);
   }
 };
 
@@ -95,8 +95,8 @@ struct SerialTbsv<Uplo::Lower, Trans::Transpose, ArgDiag,
     if (info) return info;
 
     return SerialTbsvInternalLowerTranspose<Algo::Tbsv::Unblocked>::invoke(
-        ArgDiag::use_unit_diag, false, A.extent(1), x.extent(0), A.data(),
-        A.stride_0(), A.stride_1(), x.data(), x.stride_0(), k);
+        ArgDiag::use_unit_diag, false, A.extent(1), A.data(), A.stride_0(),
+        A.stride_1(), x.data(), x.stride_0(), k);
   }
 };
 
@@ -111,8 +111,8 @@ struct SerialTbsv<Uplo::Lower, Trans::ConjTranspose, ArgDiag,
     if (info) return info;
 
     return SerialTbsvInternalLowerTranspose<Algo::Tbsv::Unblocked>::invoke(
-        ArgDiag::use_unit_diag, true, A.extent(1), x.extent(0), A.data(),
-        A.stride_0(), A.stride_1(), x.data(), x.stride_0(), k);
+        ArgDiag::use_unit_diag, true, A.extent(1), A.data(), A.stride_0(),
+        A.stride_1(), x.data(), x.stride_0(), k);
   }
 };
 
@@ -127,8 +127,8 @@ struct SerialTbsv<Uplo::Upper, Trans::NoTranspose, ArgDiag,
     if (info) return info;
 
     return SerialTbsvInternalUpper<Algo::Tbsv::Unblocked>::invoke(
-        ArgDiag::use_unit_diag, A.extent(1), x.extent(0), A.data(),
-        A.stride_0(), A.stride_1(), x.data(), x.stride_0(), k);
+        ArgDiag::use_unit_diag, A.extent(1), A.data(), A.stride_0(),
+        A.stride_1(), x.data(), x.stride_0(), k);
   }
 };
 
@@ -143,8 +143,8 @@ struct SerialTbsv<Uplo::Upper, Trans::Transpose, ArgDiag,
     if (info) return info;
 
     return SerialTbsvInternalUpperTranspose<Algo::Tbsv::Unblocked>::invoke(
-        ArgDiag::use_unit_diag, false, A.extent(1), x.extent(0), A.data(),
-        A.stride_0(), A.stride_1(), x.data(), x.stride_0(), k);
+        ArgDiag::use_unit_diag, false, A.extent(1), A.data(), A.stride_0(),
+        A.stride_1(), x.data(), x.stride_0(), k);
   }
 };
 
@@ -159,8 +159,8 @@ struct SerialTbsv<Uplo::Upper, Trans::ConjTranspose, ArgDiag,
     if (info) return info;
 
     return SerialTbsvInternalUpperTranspose<Algo::Tbsv::Unblocked>::invoke(
-        ArgDiag::use_unit_diag, true, A.extent(1), x.extent(0), A.data(),
-        A.stride_0(), A.stride_1(), x.data(), x.stride_0(), k);
+        ArgDiag::use_unit_diag, true, A.extent(1), A.data(), A.stride_0(),
+        A.stride_1(), x.data(), x.stride_0(), k);
   }
 };
 
diff --git a/batched/dense/impl/KokkosBatched_Tbsv_Serial_Internal.hpp b/batched/dense/impl/KokkosBatched_Tbsv_Serial_Internal.hpp
index 8394d206ce..d2f5df4649 100644
--- a/batched/dense/impl/KokkosBatched_Tbsv_Serial_Internal.hpp
+++ b/batched/dense/impl/KokkosBatched_Tbsv_Serial_Internal.hpp
@@ -35,7 +35,7 @@ template <typename AlgoType>
 struct SerialTbsvInternalLower {
   template <typename ValueType>
   KOKKOS_INLINE_FUNCTION static int invoke(const bool use_unit_diag,
-                                           const int an, const int xm,
+                                           const int an,
                                            const ValueType *KOKKOS_RESTRICT A,
                                            const int as0, const int as1,
                                            /**/ ValueType *KOKKOS_RESTRICT x,
@@ -46,8 +46,8 @@ template <>
 template <typename ValueType>
 KOKKOS_INLINE_FUNCTION int
 SerialTbsvInternalLower<Algo::Tbsv::Unblocked>::invoke(
-    const bool use_unit_diag, const int an, const int xn,
-    const ValueType *KOKKOS_RESTRICT A, const int as0, const int as1,
+    const bool use_unit_diag, const int an, const ValueType *KOKKOS_RESTRICT A,
+    const int as0, const int as1,
     /**/ ValueType *KOKKOS_RESTRICT x, const int xs0, const int k) {
 #if defined(KOKKOS_ENABLE_PRAGMA_UNROLL)
 #pragma unroll
@@ -76,17 +76,19 @@ SerialTbsvInternalLower<Algo::Tbsv::Unblocked>::invoke(
 template <typename AlgoType>
 struct SerialTbsvInternalLowerTranspose {
   template <typename ValueType>
-  KOKKOS_INLINE_FUNCTION static int invoke(
-      const bool use_unit_diag, const bool do_conj, const int an, const int xm,
-      const ValueType *KOKKOS_RESTRICT A, const int as0, const int as1,
-      /**/ ValueType *KOKKOS_RESTRICT x, const int xs0, const int k);
+  KOKKOS_INLINE_FUNCTION static int invoke(const bool use_unit_diag,
+                                           const bool do_conj, const int an,
+                                           const ValueType *KOKKOS_RESTRICT A,
+                                           const int as0, const int as1,
+                                           /**/ ValueType *KOKKOS_RESTRICT x,
+                                           const int xs0, const int k);
 };
 
 template <>
 template <typename ValueType>
 KOKKOS_INLINE_FUNCTION int
 SerialTbsvInternalLowerTranspose<Algo::Tbsv::Unblocked>::invoke(
-    const bool use_unit_diag, const bool do_conj, const int an, const int xn,
+    const bool use_unit_diag, const bool do_conj, const int an,
     const ValueType *KOKKOS_RESTRICT A, const int as0, const int as1,
     /**/ ValueType *KOKKOS_RESTRICT x, const int xs0, const int k) {
 #if defined(KOKKOS_ENABLE_PRAGMA_UNROLL)
@@ -129,7 +131,7 @@ template <typename AlgoType>
 struct SerialTbsvInternalUpper {
   template <typename ValueType>
   KOKKOS_INLINE_FUNCTION static int invoke(const bool use_unit_diag,
-                                           const int an, const int xm,
+                                           const int an,
                                            const ValueType *KOKKOS_RESTRICT A,
                                            const int as0, const int as1,
                                            /**/ ValueType *KOKKOS_RESTRICT x,
@@ -140,8 +142,8 @@ template <>
 template <typename ValueType>
 KOKKOS_INLINE_FUNCTION int
 SerialTbsvInternalUpper<Algo::Tbsv::Unblocked>::invoke(
-    const bool use_unit_diag, const int an, const int xn,
-    const ValueType *KOKKOS_RESTRICT A, const int as0, const int as1,
+    const bool use_unit_diag, const int an, const ValueType *KOKKOS_RESTRICT A,
+    const int as0, const int as1,
     /**/ ValueType *KOKKOS_RESTRICT x, const int xs0, const int k) {
 #if defined(KOKKOS_ENABLE_PRAGMA_UNROLL)
 #pragma unroll
@@ -170,17 +172,19 @@ SerialTbsvInternalUpper<Algo::Tbsv::Unblocked>::invoke(
 template <typename AlgoType>
 struct SerialTbsvInternalUpperTranspose {
   template <typename ValueType>
-  KOKKOS_INLINE_FUNCTION static int invoke(
-      const bool use_unit_diag, const bool do_conj, const int an, const int xm,
-      const ValueType *KOKKOS_RESTRICT A, const int as0, const int as1,
-      /**/ ValueType *KOKKOS_RESTRICT x, const int xs0, const int k);
+  KOKKOS_INLINE_FUNCTION static int invoke(const bool use_unit_diag,
+                                           const bool do_conj, const int an,
+                                           const ValueType *KOKKOS_RESTRICT A,
+                                           const int as0, const int as1,
+                                           /**/ ValueType *KOKKOS_RESTRICT x,
+                                           const int xs0, const int k);
 };
 
 template <>
 template <typename ValueType>
 KOKKOS_INLINE_FUNCTION int
 SerialTbsvInternalUpperTranspose<Algo::Tbsv::Unblocked>::invoke(
-    const bool use_unit_diag, const bool do_conj, const int an, const int xn,
+    const bool use_unit_diag, const bool do_conj, const int an,
     const ValueType *KOKKOS_RESTRICT A, const int as0, const int as1,
     /**/ ValueType *KOKKOS_RESTRICT x, const int xs0, const int k) {
 #if defined(KOKKOS_ENABLE_PRAGMA_UNROLL)