diff --git a/wpilibj/src/main/native/cpp/AnalogJNI.cpp b/wpilibj/src/main/native/cpp/AnalogJNI.cpp
index 6d0781aef2..32f761aa74 100644
--- a/wpilibj/src/main/native/cpp/AnalogJNI.cpp
+++ b/wpilibj/src/main/native/cpp/AnalogJNI.cpp
@@ -509,7 +509,11 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAccumulatorOutput(
   int32_t status = 0;
   jlong *valuePtr = (jlong *)env->GetDirectBufferAddress(value);
   jlong *countPtr = (jlong *)env->GetDirectBufferAddress(count);
-  HAL_GetAccumulatorOutput((HAL_AnalogInputHandle)id, valuePtr, countPtr, &status);
+  int64_t valueInt64;
+  int64_t countInt64;
+  HAL_GetAccumulatorOutput((HAL_AnalogInputHandle)id, &valueInt64, &countInt64, &status);
+  *valuePtr = valueInt64;
+  *countPtr = countInt64;
   ANALOGJNI_LOG(logDEBUG) << "Value = " << *valuePtr;
   ANALOGJNI_LOG(logDEBUG) << "Count = " << *countPtr;
   ANALOGJNI_LOG(logDEBUG) << "Status = " << status;
diff --git a/wpilibj/src/main/native/cpp/SPIJNI.cpp b/wpilibj/src/main/native/cpp/SPIJNI.cpp
index a52d23f0be..d8dc2dc012 100644
--- a/wpilibj/src/main/native/cpp/SPIJNI.cpp
+++ b/wpilibj/src/main/native/cpp/SPIJNI.cpp
@@ -356,7 +356,13 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiGetAccumulatorOutput(
   jlong *valuePtr = (jlong *)env->GetDirectBufferAddress(value);
   jlong *countPtr = (jlong *)env->GetDirectBufferAddress(count);
 
-  HAL_GetSPIAccumulatorOutput(static_cast<HAL_SPIPort>(port), valuePtr, countPtr, &status);
+  int64_t valueInt64;
+  int64_t countInt64;
+
+  HAL_GetSPIAccumulatorOutput(static_cast<HAL_SPIPort>(port), &valueInt64, &countInt64, &status);
+
+  *valuePtr = valueInt64;
+  *countPtr = countInt64;
 
   SPIJNI_LOG(logDEBUG) << "Status = " << status;
   SPIJNI_LOG(logDEBUG) << "Value = " << *valuePtr;