diff --git a/src/apds9930/apds9930.cxx b/src/apds9930/apds9930.cxx
index a7d7bb7e..e365d4c6 100644
--- a/src/apds9930/apds9930.cxx
+++ b/src/apds9930/apds9930.cxx
@@ -48,7 +48,7 @@ int
 APDS9930::getAmbient()
 {
     int iio_value = 0;
-    mraa_iio_read_integer(m_iio, "in_illuminance_input", &iio_value);
+    mraa_iio_read_int(m_iio, "in_illuminance_input", &iio_value);
     return iio_value;
 }
 
@@ -56,6 +56,6 @@ int
 APDS9930::getProximity()
 {
     int iio_value = 0;
-    mraa_iio_read_integer(m_iio, "in_proximity_raw", &iio_value);
+    mraa_iio_read_int(m_iio, "in_proximity_raw", &iio_value);
     return iio_value;
 }
diff --git a/src/apds9930/javaupm_apds9930.i b/src/apds9930/javaupm_apds9930.i
index 07c8ce72..ca8aa53c 100755
--- a/src/apds9930/javaupm_apds9930.i
+++ b/src/apds9930/javaupm_apds9930.i
@@ -1,14 +1,18 @@
 %module javaupm_apds9930
 %include "../upm.i"
-%include "stdint.i"
-%include "typemaps.i"
-
-%feature("director") IsrCallback;
-
-%ignore generic_callback_isr;
-%include "../IsrCallback.h"
 
 %{
     #include "apds9930.h"
 %}
 %include "apds9930.h"
+
+%pragma(java) jniclasscode=%{
+    static {
+        try {
+            System.loadLibrary("javaupm_apds9930");
+        } catch (UnsatisfiedLinkError e) {
+            System.err.println("Native code library failed to load. \n" + e);
+            System.exit(1);
+        }
+    }
+%}