diff --git a/src/App.cpp b/src/App.cpp
index 96d1688b..e75766ac 100644
--- a/src/App.cpp
+++ b/src/App.cpp
@@ -55,7 +55,7 @@ xmrig::App::App(Process *process) :
     m_httpd(nullptr),
     m_signals(nullptr)
 {
-    m_controller = new xmrig::Controller(process);
+    m_controller = new Controller(process);
     if (m_controller->init() != 0) {
         return;
     }
@@ -178,7 +178,7 @@ void xmrig::App::onSignal(int signum)
         break;
 
     default:
-        break;
+        return;
     }
 
     close();
diff --git a/src/common/crypto/Algorithm.cpp b/src/common/crypto/Algorithm.cpp
index dd864705..7d03acfc 100644
--- a/src/common/crypto/Algorithm.cpp
+++ b/src/common/crypto/Algorithm.cpp
@@ -113,6 +113,7 @@ static AlgoData const xmrStakAlgorithms[] = {
     { "cryptonight_alloy",       nullptr, xmrig::CRYPTONIGHT,       xmrig::VARIANT_XAO  }, // xmr-stak-alloy
     { "cryptonight_turtle",      nullptr, xmrig::CRYPTONIGHT_PICO,  xmrig::VARIANT_TRTL },
     { "cryptonight_gpu",         nullptr, xmrig::CRYPTONIGHT,       xmrig::VARIANT_GPU  },
+    { "cryptonight_r",           nullptr, xmrig::CRYPTONIGHT,       xmrig::VARIANT_4  },
 };
 #endif
 
diff --git a/src/core/Controller.cpp b/src/core/Controller.cpp
index 1b30b4cd..7639bfaa 100644
--- a/src/core/Controller.cpp
+++ b/src/core/Controller.cpp
@@ -99,7 +99,7 @@ int xmrig::Controller::init()
 {
     Cpu::init();
 
-    d_ptr->config = xmrig::Config::load(d_ptr->process, this);
+    d_ptr->config = Config::load(d_ptr->process, this);
     if (!d_ptr->config) {
         return 1;
     }