diff --git a/src/api/v1/ApiRouter.cpp b/src/api/v1/ApiRouter.cpp
index 0f754e17..ff1ef404 100644
--- a/src/api/v1/ApiRouter.cpp
+++ b/src/api/v1/ApiRouter.cpp
@@ -22,7 +22,7 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <math.h>
+#include <cmath>
 #include <string.h>
 #include <uv.h>
 
@@ -44,7 +44,7 @@ static inline rapidjson::Value normalize(double d)
 {
     using namespace rapidjson;
 
-    if (!isnormal(d)) {
+    if (!std::isnormal(d)) {
         return Value(kNullType);
     }
 
diff --git a/src/backend/cpu/platform/AdvancedCpuInfo.cpp b/src/backend/cpu/platform/AdvancedCpuInfo.cpp
index b5b2fe91..f3c4ed23 100644
--- a/src/backend/cpu/platform/AdvancedCpuInfo.cpp
+++ b/src/backend/cpu/platform/AdvancedCpuInfo.cpp
@@ -22,6 +22,7 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <algorithm>
 #include <assert.h>
 #include <libcpuid.h>
 #include <math.h>
diff --git a/src/backend/cpu/platform/BasicCpuInfo.cpp b/src/backend/cpu/platform/BasicCpuInfo.cpp
index 26237468..369392b6 100644
--- a/src/backend/cpu/platform/BasicCpuInfo.cpp
+++ b/src/backend/cpu/platform/BasicCpuInfo.cpp
@@ -124,8 +124,8 @@ static inline bool has_ossave()
 
 xmrig::BasicCpuInfo::BasicCpuInfo() :
     m_assembly(Assembly::NONE),
-    m_brand(),
     m_aes(has_aes_ni()),
+    m_brand(),
     m_avx2(has_avx2() && has_ossave()),
     m_threads(std::thread::hardware_concurrency())
 {
diff --git a/src/backend/cpu/platform/BasicCpuInfo.h b/src/backend/cpu/platform/BasicCpuInfo.h
index 12c275dd..886d59c3 100644
--- a/src/backend/cpu/platform/BasicCpuInfo.h
+++ b/src/backend/cpu/platform/BasicCpuInfo.h
@@ -55,8 +55,8 @@ protected:
 
 private:
     Assembly m_assembly;
+    bool m_aes;
     char m_brand[64 + 6];
-    const bool m_aes;
     const bool m_avx2;
     const size_t m_threads;
 };
diff --git a/src/backend/cpu/platform/BasicCpuInfo_arm.cpp b/src/backend/cpu/platform/BasicCpuInfo_arm.cpp
index 49e300e4..6702f6f0 100644
--- a/src/backend/cpu/platform/BasicCpuInfo_arm.cpp
+++ b/src/backend/cpu/platform/BasicCpuInfo_arm.cpp
@@ -37,8 +37,8 @@
 
 xmrig::BasicCpuInfo::BasicCpuInfo() :
     m_aes(false),
-    m_avx2(false),
     m_brand(),
+    m_avx2(false),
     m_threads(std::thread::hardware_concurrency())
 {
 #   ifdef XMRIG_ARMv8
@@ -61,3 +61,9 @@ size_t xmrig::BasicCpuInfo::optimalThreadsCount(size_t memSize, int maxCpuUsage)
 {
     return threads();
 }
+
+
+xmrig::CpuThreads xmrig::BasicCpuInfo::threads(const Algorithm &algorithm) const
+{
+    return CpuThreads(threads());
+}