diff --git a/src/java/mraajava.i b/src/java/mraajava.i
index 36d8b62..37927ba 100644
--- a/src/java/mraajava.i
+++ b/src/java/mraajava.i
@@ -8,7 +8,7 @@
 %typemap(javain) (uint8_t *txBuf, int length) "$javainput"
 
 %typemap(in,numinputs=1) (uint8_t *txBuf, int length) {
-  $1 = JCALL2(GetByteArrayElements, jenv, $input, NULL);
+  $1 = (uint8_t *) JCALL2(GetByteArrayElements, jenv, $input, NULL);
   $2 = JCALL1(GetArrayLength, jenv, $input);
 }
 
@@ -23,7 +23,7 @@
 }
 
 %typemap(argout) (uint8_t *data, int length) {
-  JCALL3(ReleaseByteArrayElements, jenv, $input, $1, JNI_COMMIT);
+  JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *) $1, JNI_COMMIT);
 }
 
 %typemap(jtype) (const uint8_t *data, int length) "byte[]"
@@ -31,7 +31,16 @@
 %typemap(jni) (const uint8_t *data, int length) "jbyteArray"
 %typemap(javain) (const uint8_t *data, int length) "$javainput"
 %typemap(in) (const uint8_t *data, int length) {
-  $1 = JCALL2(GetByteArrayElements, jenv, $input, NULL);
+  $1 = (uint8_t *) JCALL2(GetByteArrayElements, jenv, $input, NULL);
+  $2 = JCALL1(GetArrayLength, jenv, $input);
+}
+
+%typemap(jtype) (uint8_t *data, int length) "byte[]"
+%typemap(jstype) (uint8_t *data, int length) "byte[]"
+%typemap(jni) (uint8_t *data, int length) "jbyteArray"
+%typemap(javain) (uint8_t *data, int length) "$javainput"
+%typemap(in) (uint8_t *data, int length) {
+  $1 = (uint8_t *)  JCALL2(GetByteArrayElements, jenv, $input, NULL);
   $2 = JCALL1(GetArrayLength, jenv, $input);
 }