diff --git a/src/kits/app/Message.cpp b/src/kits/app/Message.cpp
index 6d838d3b04..839d40b657 100644
--- a/src/kits/app/Message.cpp
+++ b/src/kits/app/Message.cpp
@@ -645,8 +645,8 @@ BMessage::_PrintToStream(const char* indent) const
 					entry_ref ref;
 					BPrivate::entry_ref_unflatten(&ref, (char *)pointer, size);
 
-					printf("entry_ref(device=%ld, directory=%lld,
-						name=\"%s\", ", ref.device, ref.directory, ref.name);
+					printf("entry_ref(device=%ld, directory=%lld,"
+						"name=\"%s\", ", ref.device, ref.directory, ref.name);
 
 					BPath path(&ref);
 					printf("path=\"%s\")\n", path.Path());
diff --git a/src/kits/app/MessageAdapter.cpp b/src/kits/app/MessageAdapter.cpp
index f74ed3edbe..2626b15618 100644
--- a/src/kits/app/MessageAdapter.cpp
+++ b/src/kits/app/MessageAdapter.cpp
@@ -519,13 +519,13 @@ MessageAdapter::_UnflattenR5Message(uint32 format, BMessage *into,
 
 	header->what = into->what = r5header.what;
 	if (r5header.flags & R5_MESSAGE_FLAG_INCLUDE_TARGET)
-		reader(header->target);
+		reader(header->target, sizeof(header->target));
 
 	if (r5header.flags & R5_MESSAGE_FLAG_INCLUDE_REPLY) {
 		// reply info
-		reader(header->reply_port);
-		reader(header->reply_target);
-		reader(header->reply_team);
+		reader(header->reply_port, sizeof(header->reply_port));
+		reader(header->reply_target, sizeof(header->reply_target));
+		reader(header->reply_team, sizeof(header->reply_team));
 
 		// big flags
 		uint8 bigFlag;