diff --git a/src/clientmon.cpp b/src/clientmon.cpp
index 94f2c51..1e5a155 100644
--- a/src/clientmon.cpp
+++ b/src/clientmon.cpp
@@ -222,8 +222,8 @@ struct SubscriptionImpl : public OperationBase, public Subscription
         }
         conn->enqueueTxBody(CMD_MONITOR);
 
-        log_debug_printf(io, "Server %s channel '%s' monitor INIT\n",
-                         conn->peerName.c_str(), chan->name.c_str());
+        log_debug_printf(io, "Server %s channel '%s' monitor INIT%s\n",
+                         conn->peerName.c_str(), chan->name.c_str(), pipeline?" pipeline":"");
 
         state = Creating;
 
diff --git a/src/servermon.cpp b/src/servermon.cpp
index 2f52e7b..447ff5f 100644
--- a/src/servermon.cpp
+++ b/src/servermon.cpp
@@ -480,6 +480,9 @@ void ServerConn::handle_MONITOR()
                 op->limit = qSize;
         });
 
+        if(op->limit < op->window)
+            op->limit = op->window;
+
         std::unique_ptr<ServerMonitorSetup> ctrl(new ServerMonitorSetup(this, iface->server->internal_self, chan->name, pvRequest, op));
 
         op->state = ServerOp::Creating;
@@ -487,8 +490,8 @@ void ServerConn::handle_MONITOR()
         opByIOID[ioid] = op;
         chan->opByIOID[ioid] = op;
 
-        log_debug_printf(connsetup, "Client %s Monitor INIT ioid=%u pvRequest=%s\n",
-                   peerName.c_str(), unsigned(ioid),
+        log_debug_printf(connsetup, "Client %s Monitor INIT%s ioid=%u pvRequest=%s\n",
+                   peerName.c_str(), op->pipeline ? " pipeline" : "", unsigned(ioid),
                    std::string(SB()<<pvRequest).c_str());
 
         if(chan->onSubscribe) {