diff --git a/include/ck_tile/ops/fmha/block/page_block_navigator.hpp b/include/ck_tile/ops/fmha/block/page_block_navigator.hpp
index 1e5e63e393..12f9e86671 100644
--- a/include/ck_tile/ops/fmha/block/page_block_navigator.hpp
+++ b/include/ck_tile/ops/fmha/block/page_block_navigator.hpp
@@ -9,10 +9,8 @@
 namespace ck_tile {
 
 // assume that we have only 1 page-block
-template <typename DataType_>
 struct TrivialPageBlockNavigator
 {
-    using DataType     = DataType_;
     using WindowOrigin = multi_index<2>;
 
     template <typename TensorView, typename WindowLengths>
@@ -21,7 +19,7 @@ struct TrivialPageBlockNavigator
                                                                const WindowOrigin& window_origin)
     {
         return make_tuple(/*block_index=*/0,
-                          make_tile_window(tensor_view, window_lengths, window_origin));
+                          ck_tile::make_tile_window(tensor_view, window_lengths, window_origin));
     }
 
     template <typename TensorView, typename WindowLengths>
diff --git a/include/ck_tile/ops/fmha/kernel/fmha_fwd_appendkv_kernel.hpp b/include/ck_tile/ops/fmha/kernel/fmha_fwd_appendkv_kernel.hpp
index e835fcf848..4d46e283d0 100644
--- a/include/ck_tile/ops/fmha/kernel/fmha_fwd_appendkv_kernel.hpp
+++ b/include/ck_tile/ops/fmha/kernel/fmha_fwd_appendkv_kernel.hpp
@@ -390,7 +390,7 @@ struct FmhaFwdAppendKVKernel
             }
             else
             {
-                return TrivialPageBlockNavigator<KDataType>();
+                return TrivialPageBlockNavigator();
             }
         }();
 
@@ -416,7 +416,7 @@ struct FmhaFwdAppendKVKernel
             }
             else
             {
-                return TrivialPageBlockNavigator<VDataType>();
+                return TrivialPageBlockNavigator();
             }
         }();
 
diff --git a/include/ck_tile/ops/fmha/kernel/fmha_fwd_splitkv_kernel.hpp b/include/ck_tile/ops/fmha/kernel/fmha_fwd_splitkv_kernel.hpp
index 88c9ccd853..fdc9eea8b8 100644
--- a/include/ck_tile/ops/fmha/kernel/fmha_fwd_splitkv_kernel.hpp
+++ b/include/ck_tile/ops/fmha/kernel/fmha_fwd_splitkv_kernel.hpp
@@ -550,7 +550,7 @@ struct FmhaFwdSplitKVKernel
             }
             else
             {
-                return TrivialPageBlockNavigator<const KDataType>();
+                return TrivialPageBlockNavigator();
             }
         }();
 
@@ -576,7 +576,7 @@ struct FmhaFwdSplitKVKernel
             }
             else
             {
-                return TrivialPageBlockNavigator<const VDataType>();
+                return TrivialPageBlockNavigator();
             }
         }();