diff --git a/examples/java/Adxl345Sample.java b/examples/java/Adxl345Sample.java
index fbabc96e..9b19b3df 100644
--- a/examples/java/Adxl345Sample.java
+++ b/examples/java/Adxl345Sample.java
@@ -49,10 +49,9 @@ public class Adxl345Sample {
 			accel = sensor.getAcceleration();
 
 			System.out.println("Current scale: " + sensor.getScale());
-			System.out.println("Raw Values: X: " + val[0] + " Y: " + val[1]
-					+ " Z: " + val[2]);
-			System.out.println("Acceleration: X: " + accel[0] + "g Y: "
-					+ accel[1] + "g Z: " + accel[2] + "g");
+			System.out.println("Raw Values: X: " + val[0] + " Y: " + val[1] + " Z: " + val[2]);
+			System.out.println("Acceleration: X: " + accel[0] + "g Y: " + accel[1] + "g Z: "
+					+ accel[2] + "g");
 
 			Thread.sleep(1000);
 		}
diff --git a/examples/java/Hmc5883lSample.java b/examples/java/Hmc5883lSample.java
index ed9a1da4..f987845c 100644
--- a/examples/java/Hmc5883lSample.java
+++ b/examples/java/Hmc5883lSample.java
@@ -38,7 +38,7 @@ public class Hmc5883lSample {
 		// Instantiate on I2C
 		upm_hmc5883l.Hmc5883l compas = new upm_hmc5883l.Hmc5883l(0);
 
-		int[] pos;
+		short[] pos;
 
 		// Set your declination from true north in radians
 		compas.set_declination(0.2749f);
@@ -48,8 +48,7 @@ public class Hmc5883lSample {
 			compas.update();
 
 			pos = compas.coordinates();
-			System.out.println("Coor: " + (short) pos[0] + " " + (short) pos[1] + " "
-					+ (short) pos[2]);
+			System.out.println("Coor: " + pos[0] + " " + pos[1] + " " + pos[2]);
 			System.out.println("Heading: " + compas.heading() + " Direction:" + compas.direction());
 
 			Thread.sleep(2000);
diff --git a/examples/java/Itg3200Sample.java b/examples/java/Itg3200Sample.java
index e76316a1..57728365 100644
--- a/examples/java/Itg3200Sample.java
+++ b/examples/java/Itg3200Sample.java
@@ -36,7 +36,7 @@ public class Itg3200Sample {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]
-		int[] rot;
+		short[] rot;
 		float[] ang;
 
 		// Note: Sensor not supported on Intel Edison with Arduino breakout
diff --git a/examples/java/LSM303Sample.java b/examples/java/LSM303Sample.java
index f3d4d4bc..a5077781 100644
--- a/examples/java/LSM303Sample.java
+++ b/examples/java/LSM303Sample.java
@@ -41,7 +41,7 @@ public class LSM303Sample {
 
 		// Get the coordinate data
 		sensor.getCoordinates();
-		int[] coor = sensor.getRawCoorData(); // in XYZ order.·
+		short[] coor = sensor.getRawCoorData(); // in XYZ order.·
 		// The sensor returns XZY, but the driver compensates and makes it XYZ
 
 		// Print out the X, Y, and Z coordinate data using two different methods
@@ -54,7 +54,7 @@ public class LSM303Sample {
 
 		// Get the acceleration
 		sensor.getAcceleration();
-		int[] accel = sensor.getRawAccelData();
+		short[] accel = sensor.getRawAccelData();
 
 		// Print out the X, Y, and Z acceleration data using two different
 		// methods
diff --git a/src/adxl345/javaupm_adxl345.i b/src/adxl345/javaupm_adxl345.i
index b1cdfd26..8094f6dd 100644
--- a/src/adxl345/javaupm_adxl345.i
+++ b/src/adxl345/javaupm_adxl345.i
@@ -16,7 +16,7 @@
 %typemap(out) float * {
     $result = JCALL1(NewFloatArray, jenv, 3);
     JCALL4(SetFloatArrayRegion, jenv, $result, 0, 3, $1);
-    delete [] $1;
+    //delete [] $1;
 }
 
 
diff --git a/src/hmc5883l/javaupm_hmc5883l.i b/src/hmc5883l/javaupm_hmc5883l.i
index c8a3345b..75a322b1 100644
--- a/src/hmc5883l/javaupm_hmc5883l.i
+++ b/src/hmc5883l/javaupm_hmc5883l.i
@@ -5,17 +5,17 @@
     #include "hmc5883l.h"
 %}
 
-%typemap(jni) int16_t* "jintArray"
-%typemap(jstype) int16_t* "int[]"
-%typemap(jtype) int16_t* "int[]"
+%typemap(jni) int16_t* "jshortArray"
+%typemap(jstype) int16_t* "short[]"
+%typemap(jtype) int16_t* "short[]"
 
 %typemap(javaout) int16_t* {
     return $jnicall;
 }
 
 %typemap(out) int16_t *coordinates {
-    $result = JCALL1(NewIntArray, jenv, 3);
-    JCALL4(SetIntArrayRegion, jenv, $result, 0, 3, (const signed int*)$1);
+    $result = JCALL1(NewShortArray, jenv, 3);
+    JCALL4(SetShortArrayRegion, jenv, $result, 0, 3, (jshort*)$1);
     //delete [] $1;
 }
 
diff --git a/src/itg3200/javaupm_itg3200.i b/src/itg3200/javaupm_itg3200.i
index f4bbaacb..1ebf1fe4 100644
--- a/src/itg3200/javaupm_itg3200.i
+++ b/src/itg3200/javaupm_itg3200.i
@@ -19,17 +19,17 @@
 }
 
 
-%typemap(jni) int16_t* "jintArray"
-%typemap(jstype) int16_t* "int[]"
-%typemap(jtype) int16_t* "int[]"
+%typemap(jni) int16_t* "jshortArray"
+%typemap(jstype) int16_t* "short[]"
+%typemap(jtype) int16_t* "short[]"
 
 %typemap(javaout) int16_t* {
     return $jnicall;
 }
 
 %typemap(out) int16_t *getRawValues {
-    $result = JCALL1(NewIntArray, jenv, 3);
-    JCALL4(SetIntArrayRegion, jenv, $result, 0, 3, (const signed int*)$1);
+    $result = JCALL1(NewShortArray, jenv, 3);
+    JCALL4(SetShortArrayRegion, jenv, $result, 0, 3, (jshort*)$1);
     //delete [] $1;
 }
 
diff --git a/src/lsm303/javaupm_lsm303.i b/src/lsm303/javaupm_lsm303.i
index dae6eb7a..bce72f72 100644
--- a/src/lsm303/javaupm_lsm303.i
+++ b/src/lsm303/javaupm_lsm303.i
@@ -5,17 +5,17 @@
     #include "lsm303.h"
 %}
 
-%typemap(jni) int16_t* "jintArray"
-%typemap(jstype) int16_t* "int[]"
-%typemap(jtype) int16_t* "int[]"
+%typemap(jni) int16_t* "jshortArray"
+%typemap(jstype) int16_t* "short[]"
+%typemap(jtype) int16_t* "short[]"
 
 %typemap(javaout) int16_t* {
     return $jnicall;
 }
 
 %typemap(out) int16_t *getRawAccelData {
-    $result = JCALL1(NewIntArray, jenv, 3);
-    JCALL4(SetIntArrayRegion, jenv, $result, 0, 3, (const signed int*)$1);
+    $result = JCALL1(NewShortArray, jenv, 3);
+    JCALL4(SetShortArrayRegion, jenv, $result, 0, 3, (jshort*)$1);
     //delete [] $1;
 }