diff --git a/src/acomms/modemdriver/iridium_shore_driver.cpp b/src/acomms/modemdriver/iridium_shore_driver.cpp
index 10e55f14..1e48050d 100644
--- a/src/acomms/modemdriver/iridium_shore_driver.cpp
+++ b/src/acomms/modemdriver/iridium_shore_driver.cpp
@@ -174,8 +174,8 @@ void goby::acomms::IridiumShoreDriver::do_work()
                         iridium_driver_cfg().hangup_seconds_after_empty())))
             {
                 glog.is(DEBUG1) && glog << "Hanging up by disconnecting" << std::endl;
-                typedef boost::bimap<ModemId,
-                                     std::shared_ptr<RUDICSConnection> >::left_map::iterator LeftIt;
+                typedef boost::bimap<ModemId, std::shared_ptr<RUDICSConnection>>::left_map::iterator
+                    LeftIt;
                 LeftIt client_it = clients_.left.find(id);
                 if (client_it != clients_.left.end())
                     rudics_server_->disconnect(client_it->second);
@@ -433,7 +433,8 @@ void goby::acomms::IridiumShoreDriver::send_sbd_mt(const std::string& bytes,
         tcp::resolver resolver(io_service);
         tcp::resolver::query query(
             iridium_shore_driver_cfg().mt_sbd_server_address(),
-            goby::util::as<std::string>(iridium_shore_driver_cfg().mt_sbd_server_port()));
+            goby::util::as<std::string>(iridium_shore_driver_cfg().mt_sbd_server_port()),
+            boost::asio::ip::resolver_query_base::numeric_service);
         tcp::resolver::iterator endpoint_iterator = resolver.resolve(query);
         tcp::resolver::iterator end;
 
diff --git a/src/acomms/modemdriver/udp_driver.cpp b/src/acomms/modemdriver/udp_driver.cpp
index cdff6090..0962b13c 100644
--- a/src/acomms/modemdriver/udp_driver.cpp
+++ b/src/acomms/modemdriver/udp_driver.cpp
@@ -78,8 +78,9 @@ void goby::acomms::UDPDriver::startup(const protobuf::DriverConfig& cfg)
                                 << "Resolving receiver: " << remote.ShortDebugString() << std::endl;
 
         boost::asio::ip::udp::resolver resolver(io_context_);
-        boost::asio::ip::udp::resolver::query query(boost::asio::ip::udp::v4(), remote.ip(),
-                                                    goby::util::as<std::string>(remote.port()));
+        boost::asio::ip::udp::resolver::query query(
+            boost::asio::ip::udp::v4(), remote.ip(), goby::util::as<std::string>(remote.port()),
+            boost::asio::ip::resolver_query_base::numeric_service);
         boost::asio::ip::udp::resolver::iterator endpoint_iterator = resolver.resolve(query);
         const boost::asio::ip::udp::endpoint& receiver = *endpoint_iterator;
         receivers_.insert(std::make_pair(remote.modem_id(), receiver));
diff --git a/src/middleware/io/detail/tcp_client_interface.h b/src/middleware/io/detail/tcp_client_interface.h
index 7c6676d8..654989f3 100644
--- a/src/middleware/io/detail/tcp_client_interface.h
+++ b/src/middleware/io/detail/tcp_client_interface.h
@@ -72,7 +72,8 @@ class TCPClientThread
         boost::asio::ip::tcp::resolver resolver(this->mutable_io());
         remote_endpoint_ =
             *resolver.resolve({boost::asio::ip::tcp::v4(), this->cfg().remote_address(),
-                               std::to_string(this->cfg().remote_port())});
+                               std::to_string(this->cfg().remote_port()),
+                               boost::asio::ip::resolver_query_base::numeric_service});
 
         auto ready = ThreadState::SUBSCRIPTIONS_COMPLETE;
         this->interthread().template publish<line_in_group>(ready);
diff --git a/src/middleware/io/udp_one_to_many.h b/src/middleware/io/udp_one_to_many.h
index 7b1f4214..4742e711 100644
--- a/src/middleware/io/udp_one_to_many.h
+++ b/src/middleware/io/udp_one_to_many.h
@@ -180,7 +180,8 @@ void goby::middleware::io::UDPOneToManyThread<
     boost::asio::ip::udp::resolver resolver(this->mutable_io());
     boost::asio::ip::udp::endpoint remote_endpoint =
         *resolver.resolve({boost::asio::ip::udp::v4(), io_msg->udp_dest().addr(),
-                           std::to_string(io_msg->udp_dest().port())});
+                           std::to_string(io_msg->udp_dest().port()),
+                           boost::asio::ip::resolver_query_base::numeric_service});
 
     this->mutable_socket().async_send_to(
         boost::asio::buffer(io_msg->data()), remote_endpoint,
diff --git a/src/middleware/io/udp_point_to_point.h b/src/middleware/io/udp_point_to_point.h
index 87fd0cc4..08f8afa1 100644
--- a/src/middleware/io/udp_point_to_point.h
+++ b/src/middleware/io/udp_point_to_point.h
@@ -84,7 +84,8 @@ class UDPPointToPointThread
         boost::asio::ip::udp::resolver resolver(this->mutable_io());
         remote_endpoint_ =
             *resolver.resolve({boost::asio::ip::udp::v4(), this->cfg().remote_address(),
-                               std::to_string(this->cfg().remote_port())});
+                               std::to_string(this->cfg().remote_port()),
+                               boost::asio::ip::resolver_query_base::numeric_service});
 
         auto ready = ThreadState::SUBSCRIPTIONS_COMPLETE;
         this->interthread().template publish<line_in_group>(ready);