diff --git a/.circleci/build_node_module.sh b/.circleci/build_node_module.sh
index 2868c624c8..04cc340e82 100644
--- a/.circleci/build_node_module.sh
+++ b/.circleci/build_node_module.sh
@@ -1,4 +1,15 @@
 #!/usr/bin/env bash
+echo "=====>Install nvm"
+curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash
+export NVM_DIR="${XDG_CONFIG_HOME/:-$HOME/.}nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+source ~/.bashrc
+
+echo "=====>Change node version"
+node --version
+nvm install 8.9.4
+nvm use 8.9.4
+node --version
 
 echo "=====>Build node module"
 
diff --git a/.circleci/config.yml b/.circleci/config.yml
index ebe06ef7f4..8f897ae5c6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -116,7 +116,7 @@ jobs:
                 ctest
   build_macos_release:
     macos:
-      xcode: "9.2.0"
+      xcode: "10.0.0"
     working_directory: ~/lib-ledger-core
     steps:
       - checkout
@@ -178,7 +178,7 @@ jobs:
             . .circleci/deploy_fat_lib.sh
   build_macos_debug:
     macos:
-      xcode: "9.2.0"
+      xcode: "10.0.0"
     working_directory: ~/lib-ledger-core
     steps:
       - checkout
diff --git a/core/src/wallet/common/database/AccountDatabaseHelper.cpp b/core/src/wallet/common/database/AccountDatabaseHelper.cpp
index 17a805e150..d1efdc8a9e 100644
--- a/core/src/wallet/common/database/AccountDatabaseHelper.cpp
+++ b/core/src/wallet/common/database/AccountDatabaseHelper.cpp
@@ -74,7 +74,7 @@ namespace ledger {
         int32_t AccountDatabaseHelper::computeNextAccountIndex(soci::session &sql, const std::string &walletUid) {
             //TODO: Enhance performance for huge wallets by reducing the select range.
             int32_t currentIndex = 0;
-            rowset<int32_t> rows = (sql.prepare << "SELECT idx FROM accounts WHERE wallet_uid = :uid", use(walletUid));
+            rowset<int32_t> rows = (sql.prepare << "SELECT idx FROM accounts WHERE wallet_uid = :uid ORDER BY idx", use(walletUid));
             for (auto& idx : rows) {
                 if (idx > currentIndex) {
                     return currentIndex;
diff --git a/tools/build_ios/ios_build.sh b/tools/build_ios/ios_build.sh
index 2af6708202..1148d7bae8 100755
--- a/tools/build_ios/ios_build.sh
+++ b/tools/build_ios/ios_build.sh
@@ -33,7 +33,7 @@ fi
 
 cp `pwd`/../lib-ledger-core/tools/build_ios/framework.plist.in `pwd`
 
-cp `pwd`/../lib-ledger-core/tools/build_ios/install_name.sh `pwd` $ARCH
+cp `pwd`/../lib-ledger-core/tools/build_ios/install_name.sh `pwd`
 
 
 
diff --git a/tools/build_ios/iphone.cmake b/tools/build_ios/iphone.cmake
index 4d620c358b..773c5c4797 100644
--- a/tools/build_ios/iphone.cmake
+++ b/tools/build_ios/iphone.cmake
@@ -9,7 +9,7 @@ endif()
 
 set(CMAKE_OSX_SYSROOT "iphoneos" CACHE STRING "System root for iOS")
 set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos;-iphonesimulator")
-#set(IOS_SDK_VERSION "12.0" CACHE STRING "Updating Xcode leads to this" FORCE)
+set(IOS_SDK_VERSION "12.0" CACHE STRING "Updating Xcode leads to this" FORCE)
 # find 'iphoneos' and 'iphonesimulator' roots and version
 find_program(XCODE_SELECT_EXECUTABLE xcode-select)
 if(NOT XCODE_SELECT_EXECUTABLE)