diff --git a/connections/implementation/client_proxy.cc b/connections/implementation/client_proxy.cc
index c0b731a2..3e1b500d 100644
--- a/connections/implementation/client_proxy.cc
+++ b/connections/implementation/client_proxy.cc
@@ -1033,7 +1033,8 @@ void ClientProxy::OnPayload(const std::string& endpoint_id, Payload payload) {
     if (item != nullptr) {
       NEARBY_LOGS(INFO) << "ClientProxy [reporting onPayloadReceived]: client="
                         << GetClientId() << "; endpoint_id=" << endpoint_id
-                        << " ; payload_id=" << payload.GetId();
+                        << " ; payload {id:" << payload.GetId()
+                        << ", type:" << payload.GetType() << "}";
       item->second.payload_cb(endpoint_id, std::move(payload));
     }
   }
diff --git a/connections/implementation/endpoint_manager.cc b/connections/implementation/endpoint_manager.cc
index 0d53d7d8..da9be295 100644
--- a/connections/implementation/endpoint_manager.cc
+++ b/connections/implementation/endpoint_manager.cc
@@ -214,10 +214,14 @@ ExceptionOr<OfflineFrame> EndpointManager::TryDecryptFrame(
     }
     auto elapsed = SystemClock::ElapsedRealtime() - start_time;
     if (elapsed > kDecryptRetryTimeout) {
-      LOG(WARNING) << "Can't decrypt the message. Timeout after " << elapsed;
+      LOG(WARNING) << "Can't decrypt the message with size = " << data.size()
+                   << " from "
+                   << location::nearby::proto::connections::Medium_Name(
+                          endpoint_channel->GetMedium())
+                   << ". Timeout after " << elapsed;
       return Exception::kTimeout;
     }
-    SystemClock::Sleep(absl::Milliseconds(1));
+    SystemClock::Sleep(absl::Milliseconds(10));
   }
 }
 
diff --git a/connections/implementation/offline_service_controller.cc b/connections/implementation/offline_service_controller.cc
index 13182f25..16f2dda4 100644
--- a/connections/implementation/offline_service_controller.cc
+++ b/connections/implementation/offline_service_controller.cc
@@ -178,9 +178,9 @@ void OfflineServiceController::SendPayload(
     Payload payload) {
   if (stop_) return;
   NEARBY_LOGS(INFO) << "Client " << client->GetClientId()
-                    << " is sending payload " << payload.GetId()
-                    << " to endpoint_ids {" << absl::StrJoin(endpoint_ids, ",")
-                    << "}";
+                    << " is sending payload {id:" << payload.GetId()
+                    << ", type:" << payload.GetType() << "} to endpoint_ids {"
+                    << absl::StrJoin(endpoint_ids, ",") << "}";
   payload_manager_.SendPayload(client, endpoint_ids, std::move(payload));
 }
 
diff --git a/connections/payload_type.h b/connections/payload_type.h
index eeca1ebd..5efcbb7f 100644
--- a/connections/payload_type.h
+++ b/connections/payload_type.h
@@ -15,16 +15,59 @@
 #ifndef CORE_PAYLOAD_TYPE_H_
 #define CORE_PAYLOAD_TYPE_H_
 
+#include <ostream>
+
 namespace nearby {
 namespace connections {
 
 enum class PayloadType { kUnknown = 0, kBytes = 1, kFile = 2, kStream = 3 };
+
 enum class PayloadDirection {
   UNKNOWN_DIRECTION_PAYLOAD = 0,
   INCOMING_PAYLOAD = 1,
   OUTGOING_PAYLOAD = 2,
 };
 
+inline std::ostream& operator<<(std::ostream& os, PayloadType payload_type) {
+  switch (payload_type) {
+    case PayloadType::kUnknown:
+      os << "kUnknown";
+      break;
+    case PayloadType::kBytes:
+      os << "kBytes";
+      break;
+    case PayloadType::kFile:
+      os << "kFile";
+      break;
+    case PayloadType::kStream:
+      os << "kStream";
+      break;
+    default:
+      os << "Invalid PayloadType";
+      break;
+  }
+  return os;
+}
+
+inline std::ostream& operator<<(std::ostream& os,
+                                PayloadDirection payload_direction) {
+  switch (payload_direction) {
+    case PayloadDirection::UNKNOWN_DIRECTION_PAYLOAD:
+      os << "UNKNOWN_DIRECTION_PAYLOAD";
+      break;
+    case PayloadDirection::INCOMING_PAYLOAD:
+      os << "INCOMING_PAYLOAD";
+      break;
+    case PayloadDirection::OUTGOING_PAYLOAD:
+      os << "OUTGOING_PAYLOAD";
+      break;
+    default:
+      os << "Invalid PayloadDirection";
+      break;
+  }
+  return os;
+}
+
 }  // namespace connections
 }  // namespace nearby