diff --git a/src/outputs/raop.c b/src/outputs/raop.c
index 7f180b5f..e0a5736c 100644
--- a/src/outputs/raop.c
+++ b/src/outputs/raop.c
@@ -3096,7 +3096,7 @@ raop_v2_control_cb(int fd, short what, void *arg)
   seq_start = be16toh(seq_start);
   seq_len = be16toh(seq_len);
 
-  DPRINTF(E_DBG, L_RAOP, "Got retransmit request, seq_start %u len %u\n", seq_start, seq_len);
+  DPRINTF(E_DBG, L_RAOP, "Got retransmit request from '%s', seq_start %u len %u\n", rs->devname, seq_start, seq_len);
 
   raop_v2_resend_range(rs, seq_start, seq_len);
 
diff --git a/src/player.c b/src/player.c
index e8f3d158..b48540dc 100644
--- a/src/player.c
+++ b/src/player.c
@@ -1092,12 +1092,17 @@ playback_cb(int fd, short what, void *arg)
 	}
 
       DPRINTF(E_LOG, L_PLAYER, "Output delay detected (behind=%" PRIu64 ", max=%d), resetting all outputs\n", overrun, pb_write_deficit_max);
-      pb_write_recovery = 1;
+      pb_write_recovery = true;
       playback_suspend();
       return;
     }
   else
-    pb_write_recovery = 0;
+    {
+      if (overrun > 0)
+	DPRINTF(E_WARN, L_PLAYER, "Output delay detected: player is %" PRIu64 " ticks behind, catching up\n", overrun);
+
+      pb_write_recovery = false;
+    }
 
   // If there was an overrun, we will try to read/write a corresponding number
   // of times so we catch up. The read from the input is non-blocking, so it