diff --git a/src/app-layer.c b/src/app-layer.c
index c7707e6409..79906702fc 100644
--- a/src/app-layer.c
+++ b/src/app-layer.c
@@ -166,7 +166,7 @@ int AppLayerHandleTCPData(AlpProtoDetectThreadCtx *dp_ctx, Flow *f,
             SCLogDebug("Stream initializer (len %" PRIu32 ")", data_len);
 #ifdef PRINT
             if (data_len > 0) {
-                printf("=> Init Stream Data -- start %s%s\n",
+                printf("=> Init Stream Data (app layer) -- start %s%s\n",
                         flags & STREAM_TOCLIENT ? "toclient" : "",
                         flags & STREAM_TOSERVER ? "toserver" : "");
                 PrintRawDataFp(stdout, data, data_len);
@@ -206,7 +206,7 @@ int AppLayerHandleTCPData(AlpProtoDetectThreadCtx *dp_ctx, Flow *f,
                     "%"PRIu16" (flow %p)", data_len, alproto, f);
 #ifdef PRINT
             if (data_len > 0) {
-                printf("=> Stream Data -- start %s%s\n",
+                printf("=> Stream Data (app layer) -- start %s%s\n",
                         flags & STREAM_TOCLIENT ? "toclient" : "",
                         flags & STREAM_TOSERVER ? "toserver" : "");
                 PrintRawDataFp(stdout, data, data_len);
@@ -243,11 +243,11 @@ int AppLayerHandleTCPMsg(AlpProtoDetectThreadCtx *dp_ctx, StreamMsg *smsg)
     SCEnter();
 
 #ifdef PRINT
-    printf("=> Init Stream Data -- start %s%s\n",
+    printf("=> Stream Data (raw reassembly) -- start %s%s\n",
             smsg->flags & STREAM_TOCLIENT ? "toclient" : "",
             smsg->flags & STREAM_TOSERVER ? "toserver" : "");
     PrintRawDataFp(stdout, smsg->data.data, smsg->data.data_len);
-    printf("=> Init Stream Data -- end\n");
+    printf("=> Stream Data -- end\n");
 #endif
     SCLogDebug("smsg %p", smsg);
     BUG_ON(smsg->flow == NULL);
diff --git a/src/stream-tcp.c b/src/stream-tcp.c
index 2a6169c5f3..51b0ccc3bf 100644
--- a/src/stream-tcp.c
+++ b/src/stream-tcp.c
@@ -3269,7 +3269,8 @@ static int StreamTcpPacket (ThreadVars *tv, Packet *p, StreamTcpThread *stt,
 
         if (ssn->state >= TCP_ESTABLISHED) {
             p->flags |= PKT_STREAM_EST;
-        } else if (ssn->state > TCP_ESTABLISHED) {
+        }
+        if (ssn->state > TCP_ESTABLISHED) {
             p->flags |= PKT_STREAM_EOF;
         }
     }