diff --git a/src/add-ons/kernel/network/protocols/tcp/BufferQueue.cpp b/src/add-ons/kernel/network/protocols/tcp/BufferQueue.cpp
index 73d65b802f..3700e085c6 100644
--- a/src/add-ons/kernel/network/protocols/tcp/BufferQueue.cpp
+++ b/src/add-ons/kernel/network/protocols/tcp/BufferQueue.cpp
@@ -60,7 +60,7 @@ BufferQueue::SetMaxBytes(size_t maxBytes)
 void
 BufferQueue::SetInitialSequence(tcp_sequence sequence)
 {
-	TRACE(("BufferQueue@%p::SetInitialSequence(%lu)\n", this,
+	TRACE(("BufferQueue@%p::SetInitialSequence(%" B_PRIu32 ")\n", this,
 		sequence.Number()));
 
 	fFirstSequence = fLastSequence = sequence;
@@ -78,10 +78,10 @@ BufferQueue::Add(net_buffer *buffer)
 void
 BufferQueue::Add(net_buffer *buffer, tcp_sequence sequence)
 {
-	TRACE(("BufferQueue@%p::Add(buffer %p, size %lu, sequence %lu)\n",
-		this, buffer, buffer->size, sequence.Number()));
-	TRACE(("  in: first: %lu, last: %lu, num: %lu, cont: %lu\n",
-		fFirstSequence.Number(), fLastSequence.Number(), fNumBytes,
+	TRACE(("BufferQueue@%p::Add(buffer %p, size %" B_PRIu32 ", sequence %"
+		B_PRIu32 ")\n", this, buffer, buffer->size, sequence.Number()));
+	TRACE(("  in: first: %" B_PRIu32 ", last: %" B_PRIu32 ", num: %lu, cont: "
+		"%lu\n", fFirstSequence.Number(), fLastSequence.Number(), fNumBytes,
 		fContiguousBytes));
 	VERIFY();
 
@@ -113,9 +113,9 @@ BufferQueue::Add(net_buffer *buffer, tcp_sequence sequence)
 		fLastSequence = sequence + buffer->size;
 		fNumBytes += buffer->size;
 
-		TRACE(("  out0: first: %lu, last: %lu, num: %lu, cont: %lu\n",
-			fFirstSequence.Number(), fLastSequence.Number(), fNumBytes,
-			fContiguousBytes));
+		TRACE(("  out0: first: %" B_PRIu32 ", last: %" B_PRIu32 ", num: %"
+			B_PRIuSIZE ", cont: %" B_PRIuSIZE "\n",	fFirstSequence.Number(),
+			fLastSequence.Number(), fNumBytes, fContiguousBytes));
 		VERIFY();
 		return;
 	}
@@ -191,9 +191,9 @@ BufferQueue::Add(net_buffer *buffer, tcp_sequence sequence)
 	}
 
 	if (buffer == NULL) {
-		TRACE(("  out1: first: %lu, last: %lu, num: %lu, cont: %lu\n",
-			fFirstSequence.Number(), fLastSequence.Number(), fNumBytes,
-			fContiguousBytes));
+		TRACE(("  out1: first: %" B_PRIu32 ", last: %" B_PRIu32 ", num: %"
+			B_PRIuSIZE ", cont: %" B_PRIuSIZE "\n", fFirstSequence.Number(),
+			fLastSequence.Number(), fNumBytes, fContiguousBytes));
 		VERIFY();
 		return;
 	}
@@ -218,8 +218,8 @@ BufferQueue::Add(net_buffer *buffer, tcp_sequence sequence)
 			&& fFirstSequence + fContiguousBytes == buffer->sequence);
 	}
 
-	TRACE(("  out2: first: %lu, last: %lu, num: %lu, cont: %lu\n",
-		fFirstSequence.Number(), fLastSequence.Number(), fNumBytes,
+	TRACE(("  out2: first: %" B_PRIu32 ", last: %" B_PRIu32 ", num: %lu, cont: "
+		"%lu\n", fFirstSequence.Number(), fLastSequence.Number(), fNumBytes,
 		fContiguousBytes));
 	VERIFY();
 }
@@ -233,7 +233,7 @@ BufferQueue::Add(net_buffer *buffer, tcp_sequence sequence)
 status_t
 BufferQueue::RemoveUntil(tcp_sequence sequence)
 {
-	TRACE(("BufferQueue@%p::RemoveUntil(sequence %lu)\n", this,
+	TRACE(("BufferQueue@%p::RemoveUntil(sequence %" B_PRIu32 ")\n", this,
 		sequence.Number()));
 	VERIFY();
 
@@ -283,7 +283,7 @@ BufferQueue::RemoveUntil(tcp_sequence sequence)
 status_t
 BufferQueue::Get(net_buffer *buffer, tcp_sequence sequence, size_t bytes)
 {
-	TRACE(("BufferQueue@%p::Get(sequence %lu, bytes %lu)\n", this,
+	TRACE(("BufferQueue@%p::Get(sequence %" B_PRIu32 ", bytes %lu)\n", this,
 		sequence.Number(), bytes));
 	VERIFY();
 
@@ -439,12 +439,15 @@ BufferQueue::SetPushPointer()
 
 
 int
-BufferQueue::PopulateSackInfo(tcp_sequence sequence, int maxSackCount, tcp_sack* sacks)
+BufferQueue::PopulateSackInfo(tcp_sequence sequence, int maxSackCount,
+	tcp_sack* sacks)
 {
 	SegmentList::ReverseIterator iterator = fList.GetReverseIterator();
 	net_buffer* buffer = iterator.Next();
 
 	int sackCount = 0;
+	TRACE(("BufferQueue::PopulateSackInfo() %" B_PRIu32 "\n",
+		sequence.Number()));
 	while (buffer != NULL && buffer->sequence > sequence) {
 		if (buffer->sequence + buffer->size < sacks[sackCount].left_edge) {
 			if (sackCount + 1 == maxSackCount)
@@ -517,8 +520,9 @@ BufferQueue::Dump() const
 	SegmentList::ConstIterator iterator = fList.GetIterator();
 	int32 number = 0;
 	while (net_buffer* buffer = iterator.Next()) {
-		kprintf("      %" B_PRId32 ". buffer %p, sequence %" B_PRIu32 ", size %"
-			B_PRIu32 "\n", ++number, buffer, buffer->sequence, buffer->size);
+		kprintf("      %" B_PRId32 ". buffer %p, sequence %" B_PRIu32
+			", size %" B_PRIu32 "\n", ++number, buffer, buffer->sequence,
+			buffer->size);
 	}
 }