diff --git a/rclcpp/test/test_interface_traits.cpp b/rclcpp/test/test_interface_traits.cpp
index 599517c328..071ac22ce7 100644
--- a/rclcpp/test/test_interface_traits.cpp
+++ b/rclcpp/test/test_interface_traits.cpp
@@ -31,7 +31,7 @@ class MyNode
     return std::make_shared<rclcpp::node_interfaces::NodeBase>(
       "my_node_name",
       "my_node_namespace",
-      rclcpp::contexts::default_context::get_global_default_context(),
+      rclcpp::contexts::get_global_default_context(),
       *options.get_rcl_node_options(),
       options.use_intra_process_comms(),
       options.enable_topic_statistics());
diff --git a/rclcpp_action/include/rclcpp_action/create_client.hpp b/rclcpp_action/include/rclcpp_action/create_client.hpp
index 2afae36f6e..2acd4d7aee 100644
--- a/rclcpp_action/include/rclcpp_action/create_client.hpp
+++ b/rclcpp_action/include/rclcpp_action/create_client.hpp
@@ -104,7 +104,7 @@ create_client(
   const std::string & name,
   rclcpp::CallbackGroup::SharedPtr group = nullptr)
 {
-  return create_client<ActionT>(
+  return rclcpp_action::create_client<ActionT>(
     node->get_node_base_interface(),
     node->get_node_graph_interface(),
     node->get_node_logging_interface(),