diff --git a/libraries/chain/db_debug.cpp b/libraries/chain/db_debug.cpp
index 89afa465..8c34df21 100644
--- a/libraries/chain/db_debug.cpp
+++ b/libraries/chain/db_debug.cpp
@@ -85,7 +85,9 @@ void database::debug_dump()
 
    const auto& vbidx = db.get_index_type<simple_index<vesting_balance_object>>();
    for( const auto& s : vbidx )
+   {
       idump(("vesting_balance")(s));
+   }
 }
 
 } }
diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp
index 744ca5ed..75a6be46 100644
--- a/libraries/wallet/wallet.cpp
+++ b/libraries/wallet/wallet.cpp
@@ -25,7 +25,6 @@
 #include <list>
 
 #include <boost/range/adaptor/map.hpp>
-#include <boost/range/algorithm_ext/insert.hpp>
 #include <boost/range/algorithm_ext/erase.hpp>
 #include <boost/range/algorithm/unique.hpp>
 #include <boost/range/algorithm/sort.hpp>
@@ -523,8 +522,10 @@ public:
 
       // make a list of all current public keys for the named account
       flat_set<public_key_type> all_keys_for_account;
-      boost::insert(all_keys_for_account, account.active.get_keys());
-      boost::insert(all_keys_for_account, account.owner.get_keys());
+      std::vector<public_key_type> active_keys = account.active.get_keys();
+      std::vector<public_key_type> owner_keys = account.owner.get_keys();
+      std::copy(active_keys.begin(), active_keys.end(), std::inserter(all_keys_for_account, all_keys_for_account.end()));
+      std::copy(owner_keys.begin(), owner_keys.end(), std::inserter(all_keys_for_account, all_keys_for_account.end()));
       all_keys_for_account.insert(account.options.memo_key);
 
       _keys[wif_pub_key] = wif_key;
diff --git a/tests/tests/authority_tests.cpp b/tests/tests/authority_tests.cpp
index af95bbab..65f9ed27 100644
--- a/tests/tests/authority_tests.cpp
+++ b/tests/tests/authority_tests.cpp
@@ -427,7 +427,8 @@ BOOST_AUTO_TEST_CASE( genesis_authority )
    BOOST_CHECK(db.get<proposal_object>(prop.id).is_authorized_to_execute(db));
 
    generate_blocks(*prop.review_period_time);
-   uop.key_approvals_to_add = {genesis_key.get_public_key()}; // was 7
+   uop.key_approvals_to_add.clear();
+   uop.key_approvals_to_add.insert(genesis_key.get_public_key()); // was 7
    trx.operations.back() = uop;
    trx.sign( genesis_key);
    // Should throw because the transaction is now in review.