diff --git a/contrib/epee/include/net/http_server_handlers_map2.h b/contrib/epee/include/net/http_server_handlers_map2.h
index 1452aa57..66e13f9a 100644
--- a/contrib/epee/include/net/http_server_handlers_map2.h
+++ b/contrib/epee/include/net/http_server_handlers_map2.h
@@ -221,8 +221,8 @@ bool auto_doc(const std::string& uri, const std::string& method, bool is_json, d
   else
   {
     //json/bin uri/based
-    typedef command_type_t::request request_t;
-    typedef command_type_t::response response_t;
+    typedef typename command_type_t::request request_t;
+    typedef typename command_type_t::response response_t;
 
     request_t req = AUTO_VAL_INIT(req); //get_documentation_json_struct<request_t>();
     response_t res = AUTO_VAL_INIT(res); //get_documentation_json_struct<response_t>();
diff --git a/tests/core_tests/ionic_swap_tests.cpp b/tests/core_tests/ionic_swap_tests.cpp
index c08634a1..9942b2f5 100644
--- a/tests/core_tests/ionic_swap_tests.cpp
+++ b/tests/core_tests/ionic_swap_tests.cpp
@@ -178,7 +178,6 @@ 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 = 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 });
 
@@ -192,7 +191,6 @@ bool ionic_swap_basic_test::c1(currency::core& c, size_t ev_index, const std::ve
     if (proposal_decoded_info.to_finalizer != proposal_details.to_finalizer
       || proposal_decoded_info.to_initiator != proposal_details.to_initiator
       || proposal_decoded_info.fee_paid_by_a != proposal_details.fee_paid_by_a
-      || proposal_decoded_info.mixins != proposal_details.mixins
       )
     {
       CHECK_AND_ASSERT_MES(false, false, "proposal actual and proposals decoded mismatch");
@@ -233,7 +231,6 @@ 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 = 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 });
 
@@ -247,7 +244,6 @@ bool ionic_swap_basic_test::c1(currency::core& c, size_t ev_index, const std::ve
     if (proposal_decoded_info.to_finalizer != proposal_details.to_finalizer
       || proposal_decoded_info.to_initiator != proposal_details.to_initiator
       || proposal_decoded_info.fee_paid_by_a != proposal_details.fee_paid_by_a
-      || proposal_decoded_info.mixins != proposal_details.mixins
       )
     {
       CHECK_AND_ASSERT_MES(false, false, "proposal actual and proposals decoded mismatch");
@@ -387,7 +383,6 @@ 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 = 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);
@@ -397,8 +392,7 @@ bool ionic_swap_exact_amounts_test::c1(currency::core& c, size_t ev_index, const
   CHECK_AND_ASSERT_MES(
     proposal_decoded_info.to_finalizer == proposal_details.to_finalizer &&
     proposal_decoded_info.to_initiator == proposal_details.to_initiator &&
-    proposal_decoded_info.fee_paid_by_a == proposal_details.fee_paid_by_a &&
-    proposal_decoded_info.mixins == proposal_details.mixins,
+    proposal_decoded_info.fee_paid_by_a == proposal_details.fee_paid_by_a,
     false, "actual and decoded proposal mismatch \nproposal_decoded_info: " 
     << epee::serialization::store_t_to_json(proposal_decoded_info) << 
     "\nproposal_details" << epee::serialization::store_t_to_json(proposal_details));
@@ -429,7 +423,6 @@ 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 = 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);
@@ -439,8 +432,7 @@ bool ionic_swap_exact_amounts_test::c1(currency::core& c, size_t ev_index, const
   CHECK_AND_ASSERT_MES(
     proposal_decoded_info.to_finalizer == proposal_details.to_finalizer &&
     proposal_decoded_info.to_initiator == proposal_details.to_initiator &&
-    proposal_decoded_info.fee_paid_by_a == proposal_details.fee_paid_by_a &&
-    proposal_decoded_info.mixins == proposal_details.mixins,
+    proposal_decoded_info.fee_paid_by_a == proposal_details.fee_paid_by_a,
     false, "actual and decoded proposal mismatch");
 
   currency::transaction tx_is2{};