diff --git a/client-android b/client-android
index 9d327802ab2def22641aa5cc8935c37710f2efe6..bee0a574a5f80f62ed9ec01d700191e0efb9a549 160000
--- a/client-android
+++ b/client-android
@@ -1 +1 @@
-Subproject commit 9d327802ab2def22641aa5cc8935c37710f2efe6
+Subproject commit bee0a574a5f80f62ed9ec01d700191e0efb9a549
diff --git a/daemon b/daemon
index 33823822334c3170c02d33945a1fd065111be291..19c0b301029478a62f332f259c9da04fb4ee8d65 160000
--- a/daemon
+++ b/daemon
@@ -1 +1 @@
-Subproject commit 33823822334c3170c02d33945a1fd065111be291
+Subproject commit 19c0b301029478a62f332f259c9da04fb4ee8d65
diff --git a/scripts/build-windows.py b/scripts/build-windows.py
index e06168e0f24a6c8a1a9dca336587c5a06d49bfd8..1980f6fb5b47a8acf0591eb798edd7eb00a1fc36 100644
--- a/scripts/build-windows.py
+++ b/scripts/build-windows.py
@@ -8,10 +8,8 @@ this_dir = os.path.dirname(os.path.realpath(__file__))
 
 def execute_cmd(cmd, with_shell=False):
     p = subprocess.Popen(cmd, shell=with_shell)
-    _, perr = p.communicate()
-    if perr:
-        return 1
-    return 0
+    _, _ = p.communicate()
+    return p.returncode
 
 
 def build_daemon(parsed_args):