diff --git a/bordeaux/service/src/android/bordeaux/services/ClusterManager.java b/bordeaux/service/src/android/bordeaux/services/ClusterManager.java
index 4f0dd68..71e77a3 100644
--- a/bordeaux/service/src/android/bordeaux/services/ClusterManager.java
+++ b/bordeaux/service/src/android/bordeaux/services/ClusterManager.java
@@ -262,9 +262,9 @@
             mSemanticClusters.clear();
             for (Map<String, String> map : allData) {
                 String semanticId = map.get(SEMANTIC_ID);
-                double longitude = Double.valueOf(map.get(SEMANTIC_LONGITUDE));
-                double latitude = Double.valueOf(map.get(SEMANTIC_LATITUDE));
-                long duration = Long.valueOf(map.get(SEMANTIC_DURATION));
+                double longitude = Double.parseDouble(map.get(SEMANTIC_LONGITUDE));
+                double latitude = Double.parseDouble(map.get(SEMANTIC_LATITUDE));
+                long duration = Long.parseLong(map.get(SEMANTIC_DURATION));
                 BaseCluster cluster =
                     new BaseCluster(semanticId, longitude, latitude, duration);
 
diff --git a/bordeaux/service/src/android/bordeaux/services/Predictor.java b/bordeaux/service/src/android/bordeaux/services/Predictor.java
index b3c0d45..9d9047a 100644
--- a/bordeaux/service/src/android/bordeaux/services/Predictor.java
+++ b/bordeaux/service/src/android/bordeaux/services/Predictor.java
@@ -147,7 +147,7 @@
             }
         } else if (key.equals(USE_HISTORY)) {
             mUseHistory = true;
-            mHistorySpan = Long.valueOf(value);
+            mHistorySpan = Long.parseLong(value);
         } else {
             Log.e(TAG,"Setting parameter " + key + " with " + value + " is not valid");
         }