diff --git a/KdeConnect/src/main/java/org/kde/connect/ComputerLinks/TcpComputerLink.java b/KdeConnect/src/main/java/org/kde/connect/ComputerLinks/TcpComputerLink.java
index 53b1f07b..d37d3582 100644
--- a/KdeConnect/src/main/java/org/kde/connect/ComputerLinks/TcpComputerLink.java
+++ b/KdeConnect/src/main/java/org/kde/connect/ComputerLinks/TcpComputerLink.java
@@ -37,6 +37,7 @@ public class TcpComputerLink extends BaseComputerLink {
                 super.messageReceived(session, message);
                 Log.e("TcpComputerLink","messageReceived (" + message.getClass() + ") " + message.toString());
                 try {
+                    //We should receive a string thanks to the TextLineCodecFactory filter
                     String theMessage = (String) message;
                     NetworkPackage np = NetworkPackage.unserialize(theMessage);
                     packageReceived(np);
diff --git a/KdeConnect/src/main/java/org/kde/connect/ServiceLauncher.java b/KdeConnect/src/main/java/org/kde/connect/ServiceLauncher.java
index 90f5479a..54dea079 100644
--- a/KdeConnect/src/main/java/org/kde/connect/ServiceLauncher.java
+++ b/KdeConnect/src/main/java/org/kde/connect/ServiceLauncher.java
@@ -5,6 +5,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
+import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
 import android.os.IBinder;
 import android.util.Log;
@@ -38,7 +39,9 @@ public class ServiceLauncher extends BroadcastReceiver
                 }
             });
         } else if (action.equals(WifiManager.SUPPLICANT_CONNECTION_CHANGE_ACTION)
-                || action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) {
+                || action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)
+                || action.equals(ConnectivityManager.CONNECTIVITY_ACTION)
+                ) {
             Log.e("KdeConnect", "Connection state changed, trying to connect");
             BackgroundService.RunCommand(context, new BackgroundService.InstanceCallback() {
                 @Override