3 files changed, 7 insertions, 3 deletions
diff --git a/src/wallet/api/wallet2_api.h b/src/wallet/api/wallet2_api.h
index a6320545e..36b3b9c9b 100644
--- a/src/wallet/api/wallet2_api.h
+++ b/src/wallet/api/wallet2_api.h
@@ -541,7 +541,7 @@ struct Wallet
     static bool addressValid(const std::string &str, NetworkType nettype);
     static bool addressValid(const std::string &str, bool testnet)          // deprecated
     {
-        return addressValid(str, testnet ? MAINNET : TESTNET);
+        return addressValid(str, testnet ? TESTNET : MAINNET);
     }
     static bool keyValid(const std::string &secret_key_string, const std::string &address_string, bool isViewKey, NetworkType nettype, std::string &error);
     static bool keyValid(const std::string &secret_key_string, const std::string &address_string, bool isViewKey, bool testnet, std::string &error)     // deprecated
diff --git a/src/wallet/api/wallet_manager.cpp b/src/wallet/api/wallet_manager.cpp
index 5b6df8a9c..b03332f40 100644
--- a/src/wallet/api/wallet_manager.cpp
+++ b/src/wallet/api/wallet_manager.cpp
@@ -37,7 +37,7 @@
 #include "common/updates.h"
 #include "version.h"
 #include "net/http_client.h"
-#include "deviuce/device.hpp"
+#include "device/device.hpp"
 #include <boost/filesystem.hpp>
 #include <boost/regex.hpp>
 
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index c97f9de07..1be379afe 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -5113,7 +5113,11 @@ int wallet2::get_fee_algorithm() const
 //------------------------------------------------------------------------------------------------------------------------------
 uint64_t wallet2::adjust_mixin(uint64_t mixin) const
 {
-  if (mixin < 4 && use_fork_rules(6, 10)) {
+  if (mixin < 6 && use_fork_rules(7, 10)) {
+    MWARNING("Requested ring size " << (mixin + 1) << " too low for hard fork 7, using 7");
+    mixin = 6;
+  }
+  else if (mixin < 4 && use_fork_rules(6, 10)) {
     MWARNING("Requested ring size " << (mixin + 1) << " too low for hard fork 6, using 5");
     mixin = 4;
   }