diff --git a/src/currency_core/currency_format_utils_abstract.h b/src/currency_core/currency_format_utils_abstract.h
index a796c974..5f1c7cf6 100644
--- a/src/currency_core/currency_format_utils_abstract.h
+++ b/src/currency_core/currency_format_utils_abstract.h
@@ -109,7 +109,7 @@ namespace currency
   //---------------------------------------------------------------
   // callback should return true to continue iterating through the container
   template <typename A, typename B, typename container_t, typename callback_t>
-  bool handle_2_alternative_types_in_variant_container(const container_t& container, callback_t& cb)
+  bool handle_2_alternative_types_in_variant_container(const container_t& container, callback_t cb)
   {
     bool found = false;
     for (auto& item : container)
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 73a6fb83..0d74da26 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -481,7 +481,6 @@ void wallet2::prepare_wti_decrypted_attachments(wallet_public::wallet_transfer_i
   {
     if (wti.remote_addresses.empty())
     {
-      account_public_address receiver_address = AUTO_VAL_INIT(receiver_address);
       handle_2_alternative_types_in_variant_container<tx_receiver, tx_receiver_old>(decrypted_att, [&](const tx_receiver& p) {
         std::string addr_str = currency::get_account_address_as_str(p.acc_addr);
         wti.remote_addresses.push_back(addr_str);