diff --git a/Source/Core/VideoCommon/XFStructs.cpp b/Source/Core/VideoCommon/XFStructs.cpp
index 9581209419..dbe3f21e02 100644
--- a/Source/Core/VideoCommon/XFStructs.cpp
+++ b/Source/Core/VideoCommon/XFStructs.cpp
@@ -288,12 +288,11 @@ void LoadIndexedXF(u32 val, int refarray)
 
 void PreprocessIndexedXF(u32 val, int refarray)
 {
-  const int index = val >> 16;
-  const int size = ((val >> 12) & 0xF) + 1;
+  const u32 index = val >> 16;
+  const u32 size = ((val >> 12) & 0xF) + 1;
 
-  const u32* new_data =
-      (u32*)Memory::GetPointer(g_preprocess_cp_state.array_bases[refarray] +
-                               g_preprocess_cp_state.array_strides[refarray] * index);
+  const u8* new_data = Memory::GetPointer(g_preprocess_cp_state.array_bases[refarray] +
+                                          g_preprocess_cp_state.array_strides[refarray] * index);
 
   const size_t buf_size = size * sizeof(u32);
   Fifo::PushFifoAuxBuffer(new_data, buf_size);