diff --git a/partners_api/booking_api.cpp b/partners_api/booking_api.cpp
index 201f2cafbd..23564f07f5 100644
--- a/partners_api/booking_api.cpp
+++ b/partners_api/booking_api.cpp
@@ -11,7 +11,7 @@
 
 #include "private.h"
 
-char const BookingApi::kDefaultCurrency[1];
+char constexpr BookingApi::kDefaultCurrency[1];
 
 BookingApi::BookingApi() : m_affiliateId(BOOKING_AFFILIATE_ID), m_testingMode(false)
 {
diff --git a/platform/network_policy.hpp b/platform/network_policy.hpp
index da732e35b4..e48ad3daa9 100644
--- a/platform/network_policy.hpp
+++ b/platform/network_policy.hpp
@@ -25,7 +25,7 @@ class NetworkPolicy
   friend NetworkPolicy ToNativeNetworkPolicy(jobject obj);
 
   // iOS
-  friend void network_policy::CallPartnersApi(PartnersApiFn fn, bool force);
+  friend void network_policy::CallPartnersApi(platform::PartnersApiFn fn, bool force);
 
 public:
   enum class Stage
diff --git a/routing/routing_session.cpp b/routing/routing_session.cpp
index 4f3011a87d..032380c2ca 100644
--- a/routing/routing_session.cpp
+++ b/routing/routing_session.cpp
@@ -423,7 +423,7 @@ void RoutingSession::MatchLocationToRoute(location::GpsInfo & location,
 
 bool RoutingSession::DisableFollowMode()
 {
-  LOG(LINFO, ("Routing disables a following mode. State: ", m_state));
+  LOG(LINFO, ("Routing disables a following mode. State: ", m_state.load()));
   if (m_state == RouteNotStarted || m_state == OnRoute)
   {
     SetState(RouteNoFollowing);
@@ -435,7 +435,7 @@ bool RoutingSession::DisableFollowMode()
 
 bool RoutingSession::EnableFollowMode()
 {
-  LOG(LINFO, ("Routing enables a following mode. State: ", m_state));
+  LOG(LINFO, ("Routing enables a following mode. State: ", m_state.load()));
   if (m_state == RouteNotStarted || m_state == OnRoute)
   {
     SetState(OnRoute);
diff --git a/tools/unix/build_omim.sh b/tools/unix/build_omim.sh
index 509ca9f7c4..04e2695935 100755
--- a/tools/unix/build_omim.sh
+++ b/tools/unix/build_omim.sh
@@ -46,7 +46,7 @@ if ! grep "DEFAULT_URLS_JSON" "$OMIM_PATH/private.h" >/dev/null 2>/dev/null; the
 fi
 
 BOOST_PATH="${BOOST_PATH:-/usr/local/boost_1.54.0}"
-DEVTOOLSET_PATH=/opt/rh/devtoolset-2
+DEVTOOLSET_PATH=/opt/rh/devtoolset-3
 if [ -d "$DEVTOOLSET_PATH" ]; then
   export MANPATH=
   source "$DEVTOOLSET_PATH/enable"
@@ -70,7 +70,7 @@ if [ "$(uname -s)" == "Darwin" ]; then
   SPEC=${SPEC:-macx-clang}
   PROCESSES=$(sysctl -n hw.ncpu)
 else
-  SPEC=${SPEC:-linux-clang-libc++}
+  SPEC=${SPEC-}
   PROCESSES=$(nproc)
 fi
 
@@ -89,20 +89,13 @@ build_conf()
   (
     export BOOST_INCLUDEDIR="$BOOST_PATH/include"
     cd "$DIRNAME"
-    if [ -n "$DEVTOOLSET_PATH" ]; then
-      "$QMAKE" "$OMIM_PATH/omim.pro" -spec $SPEC CONFIG+=$CONF ${CONFIG+"CONFIG*=$CONFIG"} \
-        "QMAKE_CXXFLAGS *=--gcc-toolchain=$DEVTOOLSET_PATH/root/usr" \
-        "QMAKE_LFLAGS *=--gcc-toolchain=$DEVTOOLSET_PATH/root/usr"
-    else
-      "$QMAKE" "$OMIM_PATH/omim.pro" -spec $SPEC CONFIG+=$CONF ${CONFIG+"CONFIG*=$CONFIG"}
-    fi
+    "$QMAKE" "$OMIM_PATH/omim.pro" ${SPEC:+-spec $SPEC} CONFIG+=$CONF ${CONFIG+"CONFIG*=$CONFIG"}
     TMP_FILE="build_error.log"
     if ! make -j $PROCESSES 2> "$TMP_FILE"; then
       echo '--------------------'
       cat "$TMP_FILE"
       exit 1
     fi
-    rm "$TMP_FILE"
   )
 }
 
@@ -113,12 +106,14 @@ build_conf_osrm()
   DIRNAME="$2"
   mkdir -p "$DIRNAME"
   OSPEC="$SPEC"
+  # OSRM is built with linux-clang spec
   [ "$OSPEC" == "linux-clang-libc++" ] && OSPEC=linux-clang
 
   (
     export BOOST_INCLUDEDIR="$BOOST_PATH/include"
     cd "$DIRNAME"
     if [ -n "$DEVTOOLSET_PATH" ]; then
+      # linux-clang spec requires --gcc-toolchain flag
       "$QMAKE" "$OMIM_PATH/omim.pro" -spec $OSPEC "CONFIG+=$CONF osrm no-tests" \
         "QMAKE_CXXFLAGS *=--gcc-toolchain=$DEVTOOLSET_PATH/root/usr" \
         "QMAKE_LFLAGS *=--gcc-toolchain=$DEVTOOLSET_PATH/root/usr"