diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 96f77c35..cf80e66e 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -5966,11 +5966,13 @@ bool wallet2::prepare_tx_sources(size_t fake_outputs_count_, std::vector<currenc
       }
 
       std::vector<COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::outs_for_amount> scanty_outs;
-      for (COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::outs_for_amount& amount_outs : daemon_resp.outs)
+      THROW_IF_FALSE_WALLET_EX(daemon_resp.outs.size() == req.amounts.size(), error::not_enough_outs_to_mix, scanty_outs, fake_outputs_count);
+      //for (COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::outs_for_amount& amount_outs : daemon_resp.outs)
+      for(size_t i = 0; i != daemon_resp.outs.size(); i++)
       {
-        if (amount_outs.outs.size() < fake_outputs_count)
+        if (daemon_resp.outs[i].outs.size() != req.amounts[i].offsets.size())
         {
-          scanty_outs.push_back(amount_outs);
+          scanty_outs.push_back(daemon_resp.outs[i]);
         }
       }
       THROW_IF_FALSE_WALLET_EX(scanty_outs.empty(), error::not_enough_outs_to_mix, scanty_outs, fake_outputs_count);
diff --git a/tests/core_tests/ionic_swap_tests.cpp b/tests/core_tests/ionic_swap_tests.cpp
index e5f96f3d..c08634a1 100644
--- a/tests/core_tests/ionic_swap_tests.cpp
+++ b/tests/core_tests/ionic_swap_tests.cpp
@@ -178,7 +178,7 @@ bool ionic_swap_basic_test::c1(currency::core& c, size_t ev_index, const std::ve
     // Alice wants to trade with Bob, to exchange 10.0 TCT to 0.5 ZANO 
     view::ionic_swap_proposal_info proposal_details = AUTO_VAL_INIT(proposal_details);
     proposal_details.fee_paid_by_a = TESTS_DEFAULT_FEE;
-    proposal_details.mixins = 10;
+    proposal_details.mixins = c.get_blockchain_storage().get_core_runtime_config().hf4_minimum_mixins;
     proposal_details.to_finalizer.push_back(view::asset_funds{ asset_id , assets_to_exchange });
     proposal_details.to_initiator.push_back(view::asset_funds{ currency::native_coin_asset_id , native_coins_to_exchange });
 
@@ -233,7 +233,7 @@ bool ionic_swap_basic_test::c1(currency::core& c, size_t ev_index, const std::ve
     //now Alice want to trade with Bob, to send 0.5 ZANO and get 10.0 TCT in exchange
     view::ionic_swap_proposal_info proposal_details = AUTO_VAL_INIT(proposal_details);
     proposal_details.fee_paid_by_a = TESTS_DEFAULT_FEE;
-    proposal_details.mixins = 10;
+    proposal_details.mixins = c.get_blockchain_storage().get_core_runtime_config().hf4_minimum_mixins;
     proposal_details.to_finalizer.push_back(view::asset_funds{ currency::native_coin_asset_id , native_coins_to_exchange });
     proposal_details.to_initiator.push_back(view::asset_funds{ asset_id , assets_to_exchange });
 
@@ -387,7 +387,7 @@ bool ionic_swap_exact_amounts_test::c1(currency::core& c, size_t ev_index, const
   proposal_details.to_initiator.push_back(view::asset_funds{ asset_id, adb.total_max_supply });
   proposal_details.to_finalizer.push_back(view::asset_funds{ native_coin_asset_id, MK_TEST_COINS(20) });
   proposal_details.fee_paid_by_a = MK_TEST_COINS(1);
-  proposal_details.mixins = 2;
+  proposal_details.mixins = c.get_blockchain_storage().get_core_runtime_config().hf4_minimum_mixins;
 
   tools::wallet_public::ionic_swap_proposal proposal{};
   alice_wlt->create_ionic_swap_proposal(proposal_details, m_accounts[BOB_ACC_IDX].get_public_address(), proposal);
@@ -429,7 +429,7 @@ bool ionic_swap_exact_amounts_test::c1(currency::core& c, size_t ev_index, const
   proposal_details.to_initiator.push_back(view::asset_funds{ asset_id, adb.total_max_supply });
   proposal_details.to_finalizer.push_back(view::asset_funds{ native_coin_asset_id, MK_TEST_COINS(20) });
   proposal_details.fee_paid_by_a = MK_TEST_COINS(1);
-  proposal_details.mixins = 2;
+  proposal_details.mixins = c.get_blockchain_storage().get_core_runtime_config().hf4_minimum_mixins;
 
   proposal = tools::wallet_public::ionic_swap_proposal{};
   carol_wlt->create_ionic_swap_proposal(proposal_details, m_accounts[ALICE_ACC_IDX].get_public_address(), proposal);
diff --git a/tests/core_tests/isolate_auditable_and_proof.cpp b/tests/core_tests/isolate_auditable_and_proof.cpp
index d079a022..b363ba12 100644
--- a/tests/core_tests/isolate_auditable_and_proof.cpp
+++ b/tests/core_tests/isolate_auditable_and_proof.cpp
@@ -44,7 +44,7 @@ bool isolate_auditable_and_proof::generate(std::vector<test_event_entry>& events
   generator.construct_genesis_block(blk_0, genesis_acc, test_core_time::get_time());
   events.push_back(blk_0);
   DO_CALLBACK(events, "configure_core");
-  REWIND_BLOCKS_N(events, blk_0r, blk_0, m_mining_accunt, CURRENCY_MINED_MONEY_UNLOCK_WINDOW + 5);
+  REWIND_BLOCKS_N(events, blk_0r, blk_0, m_mining_accunt, CURRENCY_MINED_MONEY_UNLOCK_WINDOW + 15);
 
   DO_CALLBACK(events, "c1");
   epee::debug::get_set_enable_assert(true, false);