diff --git a/polyp/module-tunnel.c b/polyp/module-tunnel.c
index c899929fa..712ec359e 100644
--- a/polyp/module-tunnel.c
+++ b/polyp/module-tunnel.c
@@ -50,11 +50,11 @@
 #ifdef TUNNEL_SINK
 #include "module-tunnel-sink-symdef.h"
 PA_MODULE_DESCRIPTION("Tunnel module for sinks")
-PA_MODULE_USAGE("server=<filename> sink=<remote sink name> cookie=<filename> format=<sample format> channels=<number of channels> rate=<sample rate> sink_name=<name for the local sink>")
+PA_MODULE_USAGE("server=<address> sink=<remote sink name> cookie=<filename> format=<sample format> channels=<number of channels> rate=<sample rate> sink_name=<name for the local sink>")
 #else
 #include "module-tunnel-source-symdef.h"
 PA_MODULE_DESCRIPTION("Tunnel module for sources")
-PA_MODULE_USAGE("server=<filename> source=<remote source name> cookie=<filename> format=<sample format> channels=<number of channels> rate=<sample rate> source_name=<name for the local source>")
+PA_MODULE_USAGE("server=<address> source=<remote source name> cookie=<filename> format=<sample format> channels=<number of channels> rate=<sample rate> source_name=<name for the local source>")
 #endif
 
 PA_MODULE_AUTHOR("Lennart Poettering")
diff --git a/polyp/polyplib-stream.c b/polyp/polyplib-stream.c
index 312f1debf..b1f198558 100644
--- a/polyp/polyplib-stream.c
+++ b/polyp/polyplib-stream.c
@@ -351,8 +351,8 @@ void pa_stream_write(struct pa_stream *s, const void *data, size_t length, void
 }
 
 size_t pa_stream_writable_size(struct pa_stream *s) {
-    assert(s && s->state == PA_STREAM_READY && s->ref >= 1);
-    return s->requested_bytes;
+    assert(s && s->ref >= 1);
+    return s->state == PA_STREAM_READY ? s->requested_bytes : 0;
 }
 
 struct pa_operation * pa_stream_drain(struct pa_stream *s, void (*cb) (struct pa_stream*s, int success, void *userdata), void *userdata) {