diff --git a/libraries/chain/block_state.cpp b/libraries/chain/block_state.cpp
index 8d38e17a48..285a422a9f 100644
--- a/libraries/chain/block_state.cpp
+++ b/libraries/chain/block_state.cpp
@@ -65,7 +65,7 @@ block_state_ptr block_state::create_if_genesis_block(const block_state_legacy& b
    result.activated_protocol_features = bsp.activated_protocol_features;
    result.core = finality_core::create_core_for_genesis_block(bsp.block_num());
 
-   // Calculate Merkel tree root in Savanna way so that it is stored in Leaf Node when building block_state.
+   // Calculate Merkle tree root in Savanna way so that it is stored in Leaf Node when building block_state.
    auto action_mroot_svnn = calculate_merkle(*bsp.action_receipt_digests);
    // built leaf_node and validation_tree
    valid_t::finality_leaf_node_t leaf_node {
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
index a2d642aaec..d459733b0f 100644
--- a/libraries/chain/controller.cpp
+++ b/libraries/chain/controller.cpp
@@ -1478,8 +1478,8 @@ struct controller_impl {
                      }
                   }
                });
-               apply<void>(chain_head, [&](const auto& head) {
-                  replay_push_block<std::decay_t<decltype(head)>>( next, controller::block_status::irreversible );
+               apply<void>(chain_head, [&]<typename T>(const T&) {
+                  replay_push_block<T>( next, controller::block_status::irreversible );
                });
                apply_l<void>(chain_head, [&](const auto& head) { // chain_head is updated via replay_push_block
                   assert(!next->is_proper_svnn_block());