diff --git a/src/CryptoNoteWrapper.cpp b/src/CryptoNoteWrapper.cpp
index 7f2f722..6d29c97 100644
--- a/src/CryptoNoteWrapper.cpp
+++ b/src/CryptoNoteWrapper.cpp
@@ -195,11 +195,11 @@ class RpcNode : CryptoNote::INodeObserver, public Node {
     return m_node.getLastLocalBlockTimestamp();
   }
 
-  uint64_t getPeerCount() {
+  uint64_t getPeerCount() override {
     return m_node.getPeerCount();
   }
 
-  uint64_t getDifficulty() {
+  uint64_t getDifficulty() override {
     try {
         CryptoNote::COMMAND_RPC_GET_INFO::request req;
         CryptoNote::COMMAND_RPC_GET_INFO::response res;
@@ -221,7 +221,7 @@ class RpcNode : CryptoNote::INodeObserver, public Node {
       }
   }
 
-  uint64_t getTxCount() {
+  uint64_t getTxCount() override {
       try {
           CryptoNote::COMMAND_RPC_GET_INFO::request req;
           CryptoNote::COMMAND_RPC_GET_INFO::response res;
@@ -243,7 +243,7 @@ class RpcNode : CryptoNote::INodeObserver, public Node {
         }
   }
 
-  uint64_t getTxPoolSize() {
+  uint64_t getTxPoolSize() override {
       try {
           CryptoNote::COMMAND_RPC_GET_INFO::request req;
           CryptoNote::COMMAND_RPC_GET_INFO::response res;
@@ -265,7 +265,7 @@ class RpcNode : CryptoNote::INodeObserver, public Node {
         }
   }
 
-  uint64_t getAltBlocksCount() {
+  uint64_t getAltBlocksCount() override {
       try {
           CryptoNote::COMMAND_RPC_GET_INFO::request req;
           CryptoNote::COMMAND_RPC_GET_INFO::response res;
@@ -287,7 +287,7 @@ class RpcNode : CryptoNote::INodeObserver, public Node {
         }
   }
 
-  uint64_t getConnectionsCount() {
+  uint64_t getConnectionsCount() override {
       try {
           CryptoNote::COMMAND_RPC_GET_INFO::request req;
           CryptoNote::COMMAND_RPC_GET_INFO::response res;
@@ -309,7 +309,7 @@ class RpcNode : CryptoNote::INodeObserver, public Node {
         }
   }
 
-  uint64_t getOutgoingConnectionsCount() {
+  uint64_t getOutgoingConnectionsCount() override {
       try {
           CryptoNote::COMMAND_RPC_GET_INFO::request req;
           CryptoNote::COMMAND_RPC_GET_INFO::response res;
@@ -331,7 +331,7 @@ class RpcNode : CryptoNote::INodeObserver, public Node {
         }
   }
 
-  uint64_t getIncomingConnectionsCount() {
+  uint64_t getIncomingConnectionsCount() override {
       try {
           CryptoNote::COMMAND_RPC_GET_INFO::request req;
           CryptoNote::COMMAND_RPC_GET_INFO::response res;
@@ -353,7 +353,7 @@ class RpcNode : CryptoNote::INodeObserver, public Node {
         }
   }
 
-  uint64_t getWhitePeerlistSize() {
+  uint64_t getWhitePeerlistSize() override {
       try {
           CryptoNote::COMMAND_RPC_GET_INFO::request req;
           CryptoNote::COMMAND_RPC_GET_INFO::response res;
@@ -375,7 +375,7 @@ class RpcNode : CryptoNote::INodeObserver, public Node {
         }
   }
 
-  uint64_t getGreyPeerlistSize() {
+  uint64_t getGreyPeerlistSize() override {
       try {
           CryptoNote::COMMAND_RPC_GET_INFO::request req;
           CryptoNote::COMMAND_RPC_GET_INFO::response res;
@@ -401,7 +401,7 @@ class RpcNode : CryptoNote::INodeObserver, public Node {
     return m_node.getLastLocalBlockHeaderInfo();
   }
 
-  uint8_t getCurrentBlockMajorVersion() {
+  uint8_t getCurrentBlockMajorVersion() override {
     return getLastLocalBlockHeaderInfo().majorVersion;
   }
 
diff --git a/src/NodeAdapter.cpp b/src/NodeAdapter.cpp
index f1dcc16..829632f 100644
--- a/src/NodeAdapter.cpp
+++ b/src/NodeAdapter.cpp
@@ -131,10 +131,11 @@ bool NodeAdapter::init() {
 
   if(connection.compare("embedded") == 0) {
 
-      m_node = nullptr;
-      return initInProcessNode();
+    m_node = nullptr;
+    return initInProcessNode();
 
-  } else if(connection.compare("local") == 0) {
+  }
+  else if(connection.compare("local") == 0) {
       QUrl localNodeUrl = QUrl::fromUserInput(QString("127.0.0.1:%1").arg(Settings::instance().getCurrentLocalDaemonPort()));
       m_node = createRpcNode(CurrencyAdapter::instance().getCurrency(), *this, LoggerAdapter::instance().getLoggerManager(), localNodeUrl.host().toStdString(), localNodeUrl.port());
       QTimer initTimer;
@@ -155,51 +156,53 @@ bool NodeAdapter::init() {
         return true;
       }
 
-  } else if(connection.compare("remote") == 0) {
-      QUrl remoteNodeUrl = QUrl::fromUserInput(Settings::instance().getCurrentRemoteNode());
-      m_node = createRpcNode(CurrencyAdapter::instance().getCurrency(), *this, LoggerAdapter::instance().getLoggerManager(), remoteNodeUrl.host().toStdString(), remoteNodeUrl.port());
-      QTimer initTimer;
-      initTimer.setInterval(3000);
-      initTimer.setSingleShot(true);
-      initTimer.start();
-      m_node->init([this](std::error_code _err) {
-          Q_UNUSED(_err);
-        });
-      QEventLoop waitLoop;
-      connect(&initTimer, &QTimer::timeout, &waitLoop, &QEventLoop::quit);
-      connect(this, &NodeAdapter::peerCountUpdatedSignal, &waitLoop, &QEventLoop::quit);
-      connect(this, &NodeAdapter::localBlockchainUpdatedSignal, &waitLoop, &QEventLoop::quit);
-      waitLoop.exec();
-      if (initTimer.isActive()) {
-        initTimer.stop();
-        Q_EMIT nodeInitCompletedSignal();
-        return true;
-      }
+  }
+  else if(connection.compare("remote") == 0) {
+    QUrl remoteNodeUrl = QUrl::fromUserInput(Settings::instance().getCurrentRemoteNode());
+    m_node = createRpcNode(CurrencyAdapter::instance().getCurrency(), *this, LoggerAdapter::instance().getLoggerManager(), remoteNodeUrl.host().toStdString(), remoteNodeUrl.port());
+    QTimer initTimer;
+    initTimer.setInterval(3000);
+    initTimer.setSingleShot(true);
+    initTimer.start();
+    m_node->init([this](std::error_code _err) {
+        Q_UNUSED(_err);
+      });
+    QEventLoop waitLoop;
+    connect(&initTimer, &QTimer::timeout, &waitLoop, &QEventLoop::quit);
+    connect(this, &NodeAdapter::peerCountUpdatedSignal, &waitLoop, &QEventLoop::quit);
+    connect(this, &NodeAdapter::localBlockchainUpdatedSignal, &waitLoop, &QEventLoop::quit);
+    waitLoop.exec();
+    if (initTimer.isActive()) {
+      initTimer.stop();
+      Q_EMIT nodeInitCompletedSignal();
+      return true;
+    }
 
-  } else {
-            QUrl localNodeUrl = QUrl::fromUserInput(QString("127.0.0.1:%1").arg(CryptoNote::RPC_DEFAULT_PORT));
-            m_node = createRpcNode(CurrencyAdapter::instance().getCurrency(), *this, LoggerAdapter::instance().getLoggerManager(), localNodeUrl.host().toStdString(), localNodeUrl.port());
-            QTimer initTimer;
-            initTimer.setInterval(3000);
-            initTimer.setSingleShot(true);
-            initTimer.start();
-            m_node->init([this](std::error_code _err) {
-                Q_UNUSED(_err);
-              });
-            QEventLoop waitLoop;
-            connect(&initTimer, &QTimer::timeout, &waitLoop, &QEventLoop::quit);
-            connect(this, &NodeAdapter::peerCountUpdatedSignal, &waitLoop, &QEventLoop::quit);
-            connect(this, &NodeAdapter::localBlockchainUpdatedSignal, &waitLoop, &QEventLoop::quit);
-            waitLoop.exec();
-            if (initTimer.isActive()) {
-              initTimer.stop();
-              Q_EMIT nodeInitCompletedSignal();
-              return true;
-            }
-            delete m_node;
-            m_node = nullptr;
-            return initInProcessNode();
-        }
+  }
+  else {
+    QUrl localNodeUrl = QUrl::fromUserInput(QString("127.0.0.1:%1").arg(CryptoNote::RPC_DEFAULT_PORT));
+    m_node = createRpcNode(CurrencyAdapter::instance().getCurrency(), *this, LoggerAdapter::instance().getLoggerManager(), localNodeUrl.host().toStdString(), localNodeUrl.port());
+    QTimer initTimer;
+    initTimer.setInterval(3000);
+    initTimer.setSingleShot(true);
+    initTimer.start();
+    m_node->init([this](std::error_code _err) {
+        Q_UNUSED(_err);
+      });
+    QEventLoop waitLoop;
+    connect(&initTimer, &QTimer::timeout, &waitLoop, &QEventLoop::quit);
+    connect(this, &NodeAdapter::peerCountUpdatedSignal, &waitLoop, &QEventLoop::quit);
+    connect(this, &NodeAdapter::localBlockchainUpdatedSignal, &waitLoop, &QEventLoop::quit);
+    waitLoop.exec();
+    if (initTimer.isActive()) {
+      initTimer.stop();
+      Q_EMIT nodeInitCompletedSignal();
+      return true;
+    }
+    delete m_node;
+    m_node = nullptr;
+    return initInProcessNode();
+  }
 
 }
 
diff --git a/src/WalletAdapter.cpp b/src/WalletAdapter.cpp
index c732fb6..1346a74 100644
--- a/src/WalletAdapter.cpp
+++ b/src/WalletAdapter.cpp
@@ -136,7 +136,7 @@ void WalletAdapter::createWallet() {
     m_wallet->initAndGenerateDeterministic("");
 
     VerifyMnemonicSeedDialog dlg(nullptr);
-    if (!dlg.exec() == QDialog::Accepted) {
+    if (dlg.exec() != QDialog::Accepted) {
       return;
     }
   } catch (std::system_error&) {
diff --git a/src/gui/MainWindow.mm b/src/gui/MainWindow.mm
index 68e088c..2f774a8 100644
--- a/src/gui/MainWindow.mm
+++ b/src/gui/MainWindow.mm
@@ -5,7 +5,7 @@
 #import <objc/runtime.h>
 #import <Cocoa/Cocoa.h>
 
-#include "mainwindow.h"
+#include "MainWindow.h"
 
 namespace WalletGui {