diff --git a/include/roar/dns/resolve.hpp b/include/roar/dns/resolve.hpp
index 1fb914a2..77b7272c 100644
--- a/include/roar/dns/resolve.hpp
+++ b/include/roar/dns/resolve.hpp
@@ -156,8 +156,8 @@ namespace Roar::Dns
         ResolverType resolver{executor};
 
         boost::system::error_code ec;
-        typename ResolverType::iterator end, start = resolver.resolve(host.c_str(), port.c_str(), flags, ec);
-        std::vector<typename ResolverType::endpoint_type> endpoints(start, end);
+        auto result = resolver.resolve(host.c_str(), port.c_str(), flags, ec);
+        std::vector<typename ResolverType::endpoint_type> endpoints{result.begin(), result.end()};
 
         if (endpoints.empty())
             throw std::runtime_error("Cannot resolve passed host.");
@@ -179,7 +179,7 @@ namespace Roar::Dns
         PickerFunctionT&& picker,
         boost::asio::ip::resolver_base::flags flags = {})
     {
-        return resolve<ExecutorType, PickerFunctionT, Protocol>(
+        return resolveSelect<ExecutorType, PickerFunctionT, Protocol>(
             std::forward<ExecutorType>(executor),
             host,
             std::to_string(port),
diff --git a/src/roar/client.cpp b/src/roar/client.cpp
index bc98409b..20e697e3 100644
--- a/src/roar/client.cpp
+++ b/src/roar/client.cpp
@@ -138,7 +138,9 @@ namespace Roar
             onResolve)
     {
         resolver_.async_resolve(
-            boost::asio::ip::tcp::resolver::query{host, port, boost::asio::ip::resolver_query_base::numeric_service},
+            host,
+            port,
+            boost::asio::ip::resolver_query_base::numeric_service,
             [onResolve = std::move(onResolve)](boost::beast::error_code ec, auto results) mutable {
                 onResolve(ec, std::move(results));
             });