diff --git a/build.gradle b/build.gradle
index 5001dbf..35db456 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,6 +22,6 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.1'
     }
 }
\ No newline at end of file
diff --git a/graphenej/src/main/java/cy/agorise/graphenej/api/android/NetworkService.java b/graphenej/src/main/java/cy/agorise/graphenej/api/android/NetworkService.java
index 75b65b8..adf9e3d 100644
--- a/graphenej/src/main/java/cy/agorise/graphenej/api/android/NetworkService.java
+++ b/graphenej/src/main/java/cy/agorise/graphenej/api/android/NetworkService.java
@@ -191,7 +191,7 @@ public class NetworkService extends Service {
     // Property used to keep track of the currently active node
     private FullNode mSelectedNode;
 
-    private Handler mHandler = new Handler();
+    private Handler mHandler = new Handler(Looper.getMainLooper());
 
     private Gson gson = new GsonBuilder()
             .registerTypeAdapter(Transaction.class, new Transaction.TransactionDeserializer())
@@ -736,8 +736,7 @@ public class NetworkService extends Service {
                     Log.e(TAG, "Giving up on connections");
                     stopSelf();
                 } else {
-                    Handler handler = new Handler(Looper.getMainLooper());
-                    handler.postDelayed(new Runnable() {
+                    mHandler.postDelayed(new Runnable() {
                         @Override
                         public void run() {
                             Log.d(TAG, "Retrying");
diff --git a/graphenej/src/main/java/cy/agorise/graphenej/network/LatencyNodeProvider.java b/graphenej/src/main/java/cy/agorise/graphenej/network/LatencyNodeProvider.java
index 92bf2c5..d7d3f21 100644
--- a/graphenej/src/main/java/cy/agorise/graphenej/network/LatencyNodeProvider.java
+++ b/graphenej/src/main/java/cy/agorise/graphenej/network/LatencyNodeProvider.java
@@ -42,6 +42,7 @@ public class LatencyNodeProvider implements NodeProvider {
     public boolean updateNode(FullNode fullNode, int latency){
         boolean existed = mFullNodeHeap.remove(fullNode);
         if(existed){
+            fullNode.addLatencyValue(latency);
             return mFullNodeHeap.add(fullNode);
         }
         return false;