diff --git a/client/ios/Berty.xcodeproj/xcshareddata/xcschemes/adhoc.xcscheme b/client/ios/Berty.xcodeproj/xcshareddata/xcschemes/adhoc.xcscheme
index c17e0d80ad..45ad4079b0 100644
--- a/client/ios/Berty.xcodeproj/xcshareddata/xcschemes/adhoc.xcscheme
+++ b/client/ios/Berty.xcodeproj/xcshareddata/xcschemes/adhoc.xcscheme
@@ -7,13 +7,13 @@
       buildImplicitDependencies = "YES">
       <PreActions>
          <ExecutionAction
-           ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
-           <ActionContent
-              title = "Run Script"
-              scriptText = "# Type a script or drag a script file from your workspace to insert its path.&#10;echo &quot;.environment&quot; &gt; /tmp/envfile&#10;">
-           </ActionContent>
-        </ExecutionAction>
-     </PreActions>
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Script"
+               scriptText = "# Type a script or drag a script file from your workspace to insert its path.&#10;echo &quot;.environment&quot; &gt; /tmp/envfile&#10;">
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
diff --git a/client/ios/Berty.xcodeproj/xcshareddata/xcschemes/release.xcscheme b/client/ios/Berty.xcodeproj/xcshareddata/xcschemes/release.xcscheme
index eccfc7c2e8..a5a2115376 100644
--- a/client/ios/Berty.xcodeproj/xcshareddata/xcschemes/release.xcscheme
+++ b/client/ios/Berty.xcodeproj/xcshareddata/xcschemes/release.xcscheme
@@ -3,7 +3,7 @@
    LastUpgradeVersion = "0620"
    version = "1.3">
    <BuildAction
-      parallelizeBuildables = "YES"
+      parallelizeBuildables = "NO"
       buildImplicitDependencies = "YES">
       <PreActions>
          <ExecutionAction
diff --git a/client/package-lock.json b/client/package-lock.json
index 8d5f2846f3..7997f3bc5b 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -5218,9 +5218,9 @@
           "integrity": "sha512-lPj3T8poYrRc/bniW5SQPND3GRtSrQdUM/R4mCYTbZxyi3jQiggLvZH4+BYUuX0t4TXjU+vMM7KFDQg+rSzZUQ=="
         },
         "electron-to-chromium": {
-          "version": "1.3.207",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.207.tgz",
-          "integrity": "sha512-RIgAnfqbjZNECBLjslfy4cIYvcPl3GAXmnENrcoo0TZ8fGkyEEAealAbO7MoevW4xYUPe+e68cWAj6eP0DmMHw=="
+          "version": "1.3.209",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.209.tgz",
+          "integrity": "sha512-KxRvLp5jUapyKIcMaecwgmUpJEsJKuHn0DJJPZjZh2valqYlzdmGvaE/nTAqwKqQwf0jIKv7Go4FYHu9wKWzOg=="
         },
         "node-releases": {
           "version": "1.1.26",
diff --git a/core/platform/mobile/Makefile b/core/platform/mobile/Makefile
index 493b30265d..17a14b6754 100644
--- a/core/platform/mobile/Makefile
+++ b/core/platform/mobile/Makefile
@@ -64,6 +64,7 @@ deps-osx:
 
 .PHONY: deps
 deps: ios-deploy gomobile gobind
+	[ ! -z "$$CIRCLE_JOB" ] || (cd $(PWD)/../.. && make generate)
 
 .PHONY: gomobile
 gomobile: $(GOPATH)/src/golang.org/x/mobile/cmd/gomobile
@@ -71,10 +72,13 @@ gomobile: $(GOPATH)/src/golang.org/x/mobile/cmd/gomobile
 .PHONY: gobind
 gobind: $(GOPATH)/src/golang.org/x/mobile/cmd/gobind
 
-$(GOPATH)/src/golang.org/x/mobile/cmd/%:
+$(GOPATH)/src/golang.org/x/mobile/cmd/gomobile $(GOPATH)/src/golang.org/x/mobile/cmd/gobind:
 	cd $(GOPATH)/src/golang.org/x/mobile && git checkout -- . || true
-	GO111MODULE=off go get -u $(patsubst $(GOPATH)/src/%,%,$@)
+	GO111MODULE=off go get -u $(GOPATH)/src/golang.org/x/mobile/cmd/gomobile
+	GO111MODULE=off go get -u $(GOPATH)/src/golang.org/x/mobile/cmd/gobind
 	patch -N $(GOPATH)/src/golang.org/x/mobile/cmd/gomobile/env.go $(BUILD_PATCH_PATH)/gomobile-env-flag.diff || (rm -rf $(GOPATH)/src/golang.org/x/mobile && false)
+	cd $(GOPATH)/src/golang.org/x/mobile && GO111MODULE=off go install -v ./cmd/...
+	gomobile init -v
 
 ifeq ($(UNAME_S),Darwin)
 IOS_DEPLOY = $(shell which ios-deploy || echo '/usr/local/bin/ios-deploy')