diff --git a/src/apps/aboutsystem/AboutSystem.cpp b/src/apps/aboutsystem/AboutSystem.cpp
index f732f5bca0..f455d58ebf 100644
--- a/src/apps/aboutsystem/AboutSystem.cpp
+++ b/src/apps/aboutsystem/AboutSystem.cpp
@@ -990,6 +990,7 @@ AboutView::_CreateCreditsView()
 		"Matthijs Hollemans\n"
 		"Mathew Hounsell\n"
 		"Morgan Howe\n"
+		"Christophe Huriaux\n"
 		"Ma Jie\n"
 		"Carwyn Jones\n"
 		"Vasilis Kaoutsis\n"
diff --git a/src/kits/network/libnetapi/DynamicBuffer.cpp b/src/kits/network/libnetapi/DynamicBuffer.cpp
index 91e2a9736f..d421dbb1b3 100644
--- a/src/kits/network/libnetapi/DynamicBuffer.cpp
+++ b/src/kits/network/libnetapi/DynamicBuffer.cpp
@@ -115,14 +115,14 @@ DynamicBuffer::Data() const
 size_t
 DynamicBuffer::Size() const
 {
-	return fBufferSize;
+	return fDataEnd - fDataStart;
 }
 
 
 size_t
 DynamicBuffer::BytesRemaining() const
 {
-	return fDataEnd - fDataStart;
+	return fBufferSize -fDataEnd;
 }
 
 
diff --git a/src/kits/network/libnetapi/NetEndpoint.cpp b/src/kits/network/libnetapi/NetEndpoint.cpp
index e595e0ee9f..b78b540673 100644
--- a/src/kits/network/libnetapi/NetEndpoint.cpp
+++ b/src/kits/network/libnetapi/NetEndpoint.cpp
@@ -555,7 +555,7 @@ BNetEndpoint::Send(const void* buffer, size_t length, int flags)
 int32
 BNetEndpoint::Send(BNetBuffer& buffer, int flags)
 {
-	return Send(buffer.Data(), buffer.BytesRemaining(), flags);
+	return Send(buffer.Data(), buffer.Size(), flags);
 }
 
 
@@ -583,7 +583,7 @@ int32
 BNetEndpoint::SendTo(BNetBuffer& buffer,
 	const BNetAddress& address, int flags)
 {
-	return SendTo(buffer.Data(), buffer.BytesRemaining(), address, flags);
+	return SendTo(buffer.Data(), buffer.Size(), address, flags);
 }