diff --git a/src/log-pcap.c b/src/log-pcap.c
index a95a2aa06e..1792fa698e 100644
--- a/src/log-pcap.c
+++ b/src/log-pcap.c
@@ -146,9 +146,9 @@ TmEcode PcapLog (ThreadVars *t, Packet *p, void *data, PacketQueue *pq, PacketQu
 
     pl->h->ts.tv_sec = p->ts.tv_sec;
     pl->h->ts.tv_usec = p->ts.tv_usec;
-    pl->h->caplen = p->pktlen;
-    pl->h->len = p->pktlen;
-    len = sizeof(*pl->h) + p->pktlen;
+    pl->h->caplen = GET_PKT_LEN(p);
+    pl->h->len = GET_PKT_LEN(p);
+    len = sizeof(*pl->h) + GET_PKT_LEN(p);
 
     SCMutexLock(&pl->file_ctx->fp_mutex);
     if ((pl->size_current + len) > pl->file_ctx->size_limit) {
@@ -184,7 +184,7 @@ TmEcode PcapLog (ThreadVars *t, Packet *p, void *data, PacketQueue *pq, PacketQu
         }
     }
 
-    pcap_dump((u_char *)pl->pcap_dumper, pl->h, p->pkt);
+    pcap_dump((u_char *)pl->pcap_dumper, pl->h, GET_PKT_DATA(p));
     pl->size_current += len;
     SCLogDebug("%u %u",pl->size_current,pl->file_ctx->size_limit);
 
diff --git a/src/source-pfring.c b/src/source-pfring.c
index 3cc757c1c5..a8824812c7 100644
--- a/src/source-pfring.c
+++ b/src/source-pfring.c
@@ -193,7 +193,7 @@ static inline void PfringProcessPacket(void *user, struct pfring_pkthdr *h, Pack
      * so that is what we do here. */
     p->datalink = LINKTYPE_ETHERNET;
 
-    p->pktlen = h->caplen;
+    SET_PKT_LEN(p, h->caplen);
 }
 
 /**
@@ -375,19 +375,17 @@ TmEcode DecodePfring(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, Pac
     SCPerfCounterIncr(dtv->counter_pkts, tv->sc_perf_pca);
     SCPerfCounterIncr(dtv->counter_pkts_per_sec, tv->sc_perf_pca);
 
-    SCPerfCounterAddUI64(dtv->counter_bytes, tv->sc_perf_pca, p->pktlen);
+    SCPerfCounterAddUI64(dtv->counter_bytes, tv->sc_perf_pca, GET_PKT_LEN(p));
 #if 0
     SCPerfCounterAddDouble(dtv->counter_bytes_per_sec, tv->sc_perf_pca, GET_PKT_LEN(p));
     SCPerfCounterAddDouble(dtv->counter_mbit_per_sec, tv->sc_perf_pca,
                            (GET_PKT_LEN(p) * 8)/1000000.0 );
 #endif
 
-    SCPerfCounterAddUI64(dtv->counter_avg_pkt_size, tv->sc_perf_pca, p->pktlen);
-    SCPerfCounterSetUI64(dtv->counter_max_pkt_size, tv->sc_perf_pca, p->pktlen);
+    SCPerfCounterAddUI64(dtv->counter_avg_pkt_size, tv->sc_perf_pca, GET_PKT_LEN(p));
+    SCPerfCounterSetUI64(dtv->counter_max_pkt_size, tv->sc_perf_pca, GET_PKT_LEN(p));
 
-    /* Bypassing the pkt buffer and size macro's as we know the size of
-     * our packet never to be bigger than default_packet_size */
-    DecodeEthernet(tv, dtv, p, p->pkt, p->pktlen, pq);
+    DecodeEthernet(tv, dtv, p, GET_PKT_DATA(p), GET_PKT_LEN(p), pq);
 
     return TM_ECODE_OK;
 }
diff --git a/src/stream-tcp.c b/src/stream-tcp.c
index 653a909aeb..d2161c195c 100644
--- a/src/stream-tcp.c
+++ b/src/stream-tcp.c
@@ -8344,8 +8344,8 @@ static int StreamTcpTest40(void) {
     memset(&tv, 0, sizeof(ThreadVars));
     memset(p, 0, SIZE_OF_PACKET);
     p->pkt = (uint8_t *)(p + 1);
-    p->pktlen = sizeof(raw_vlan);
-    memcpy(p->pkt, raw_vlan, sizeof(raw_vlan));
+    SET_PKT_LEN(p, sizeof(raw_vlan));
+    memcpy(GET_PKT_DATA(p), raw_vlan, sizeof(raw_vlan));
     memset(&dtv, 0, sizeof(DecodeThreadVars));
 
     FlowInitConfig(FLOW_QUIET);