diff --git a/contrib/epee/include/gzip_encoding.h b/contrib/epee/include/gzip_encoding.h
index bea62d01..1d354f78 100644
--- a/contrib/epee/include/gzip_encoding.h
+++ b/contrib/epee/include/gzip_encoding.h
@@ -182,7 +182,7 @@ namespace net_utils
     *
     */
     inline 
-    virtual void stop(std::string& OUT collect_remains)
+    virtual void stop(std::string& OUT collect_remains) override
     {
     }
   protected:
diff --git a/src/currency_core/currency_format_utils.cpp b/src/currency_core/currency_format_utils.cpp
index 96d55b46..60024b71 100644
--- a/src/currency_core/currency_format_utils.cpp
+++ b/src/currency_core/currency_format_utils.cpp
@@ -4274,7 +4274,7 @@ namespace currency
   {
     payment_id.clear();
     blobdata blob;
-    uint64_t prefix;
+    uint64_t prefix{};
     if (!tools::base58::decode_addr(str, prefix, blob))
     {
       LOG_PRINT_L1("Invalid address format: base58 decoding failed for \"" << str << "\"");
diff --git a/src/currency_core/genesis.cpp b/src/currency_core/genesis.cpp
index a58dcb4e..5c5435a5 100644
--- a/src/currency_core/genesis.cpp
+++ b/src/currency_core/genesis.cpp
@@ -1,8 +1,7 @@
-// Copyright (c) 2014-2018 Zano Project
+// Copyright (c) 2014-2025 Zano Project
 // Copyright (c) 2014-2018 The Louisdor Project
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
 #include "genesis.h"
 
 namespace currency
@@ -17,4 +16,3 @@ namespace currency
       {0x00,0x00}};
 #endif
 }
-
diff --git a/src/currency_core/genesis.h b/src/currency_core/genesis.h
index 8ea77d89..1c025c90 100644
--- a/src/currency_core/genesis.h
+++ b/src/currency_core/genesis.h
@@ -1,11 +1,11 @@
-// Copyright (c) 2014-2018 Zano Project
-// Copyright (c) 2014-2018 Zano Project
+// Copyright (c) 2014-2025 Zano Project
 // Copyright (c) 2014-2018 The Louisdor Project
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#pragma once 
+#pragma once
 #include <string>
+#include <cstdint>
+
 namespace currency
 {
 #pragma pack(push, 1)
@@ -17,7 +17,7 @@ namespace currency
   };
 
 #else
-  struct genesis_tx_raw_data 
+  struct genesis_tx_raw_data
   {
     uint64_t const v[42];
     uint8_t const r[2];
@@ -26,7 +26,3 @@ namespace currency
 #pragma pack(pop)
   extern const genesis_tx_raw_data ggenesis_tx_raw;
 }
-
-
-
-
diff --git a/src/wallet/plain_wallet_api.h b/src/wallet/plain_wallet_api.h
index f12eba03..84fe46ae 100644
--- a/src/wallet/plain_wallet_api.h
+++ b/src/wallet/plain_wallet_api.h
@@ -1,11 +1,10 @@
-// Copyright (c) 2014-2020 Zano Project
+// Copyright (c) 2014-2025 Zano Project
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-
 #pragma once
 
 #include <string>
+#include <cstdint>
 #include "../common/error_codes.h"
 
 namespace plain_wallet
diff --git a/tests/data/account-002bee2f8e16f5de4db0d3b8ce9227c8c0b7f9688348b028e022cb43f210968b40a69cdc8531fd4a2e7c9e144eec48bb477733d70ce5f9b85338a07cb10b849ad8fb b/tests/data/account-002bee2f8e16f5de4db0d3b8ce9227c8c0b7f9688348b028e022cb43f210968b40a69cdc8531fd4a2e7c9e144eec48bb477733d70ce5f9b85338a07cb10b849ad8fb
deleted file mode 100644
index 11927ecc..00000000
Binary files a/tests/data/account-002bee2f8e16f5de4db0d3b8ce9227c8c0b7f9688348b028e022cb43f210968b40a69cdc8531fd4a2e7c9e144eec48bb477733d70ce5f9b85338a07cb10b849ad8fb and /dev/null differ
diff --git a/tests/data/account-007af2d7c5ffd8f69005debae820207820805e28c7d7a16714591143f56fb51e2b91ad0c1a535567e6292b321773df5e5aaace00fe767c4f09de452838575357ca9f b/tests/data/account-007af2d7c5ffd8f69005debae820207820805e28c7d7a16714591143f56fb51e2b91ad0c1a535567e6292b321773df5e5aaace00fe767c4f09de452838575357ca9f
deleted file mode 100644
index 12f4a0f1..00000000
Binary files a/tests/data/account-007af2d7c5ffd8f69005debae820207820805e28c7d7a16714591143f56fb51e2b91ad0c1a535567e6292b321773df5e5aaace00fe767c4f09de452838575357ca9f and /dev/null differ
diff --git a/tests/data/account-009b82d66dfaaba55a581913fa09d6c5bebe179cd73731781265c96e9e630dcd27fd5d20e7f1d0fa42619de9ca8fe4c0659f6959b2bebb15079cdaed07a442a78486 b/tests/data/account-009b82d66dfaaba55a581913fa09d6c5bebe179cd73731781265c96e9e630dcd27fd5d20e7f1d0fa42619de9ca8fe4c0659f6959b2bebb15079cdaed07a442a78486
deleted file mode 100644
index bee40fa5..00000000
Binary files a/tests/data/account-009b82d66dfaaba55a581913fa09d6c5bebe179cd73731781265c96e9e630dcd27fd5d20e7f1d0fa42619de9ca8fe4c0659f6959b2bebb15079cdaed07a442a78486 and /dev/null differ
diff --git a/tests/data/account-00aff84db50d6a54dd56051379f6c336fdd330d1cb11e7523bbf71f30b1ae760fa47ace8679b6486f79429980fd2331715a631f5729db284eb1fc6f108aeb7a7f4fe b/tests/data/account-00aff84db50d6a54dd56051379f6c336fdd330d1cb11e7523bbf71f30b1ae760fa47ace8679b6486f79429980fd2331715a631f5729db284eb1fc6f108aeb7a7f4fe
deleted file mode 100644
index 54122832..00000000
Binary files a/tests/data/account-00aff84db50d6a54dd56051379f6c336fdd330d1cb11e7523bbf71f30b1ae760fa47ace8679b6486f79429980fd2331715a631f5729db284eb1fc6f108aeb7a7f4fe and /dev/null differ