diff --git a/src/add-ons/kernel/file_systems/netfs/client/ShareVolume.cpp b/src/add-ons/kernel/file_systems/netfs/client/ShareVolume.cpp
index 8a6e8a46c6..4f3d8de995 100644
--- a/src/add-ons/kernel/file_systems/netfs/client/ShareVolume.cpp
+++ b/src/add-ons/kernel/file_systems/netfs/client/ShareVolume.cpp
@@ -191,7 +191,7 @@ PRINT(("ShareVolume::~ShareVolume()\n"));
 		// there shouldn't be any more nodes
 		if (fNodes->Size() > 0) {
 			WARN("ShareVolume::~ShareVolume(): WARNING: There are still "
-				"%ld nodes\n", fNodes->Size());
+				"%" B_PRId32 " nodes\n", fNodes->Size());
 		}
 		for (NodeMap::Iterator it = fNodes->GetIterator(); it.HasNext();)
 			delete it.Next().value;
@@ -203,7 +203,7 @@ PRINT(("ShareVolume::~ShareVolume()\n"));
 		// there shouldn't be any more entries
 		if (fEntries->Size() > 0) {
 			WARN("ShareVolume::~ShareVolume(): WARNING: There are still "
-				"%ld entries\n", fEntries->Size());
+				"%" B_PRId32 " entries\n", fEntries->Size());
 		}
 		for (EntryMap::Iterator it = fEntries->GetIterator(); it.HasNext();)
 			delete it.Next().value;
@@ -2751,7 +2751,7 @@ ShareVolume::_RemoveAttrDirIterator(ShareNode* node,
 		= fAttrDirIterators->Get(node->GetID());
 	if (!iteratorList) {
 		WARN("ShareVolume::_RemoveAttrDirIterator(): Iterator list not "
-			"found: node: %lld\n", node->GetID());
+			"found: node: %" B_PRIdINO "\n", node->GetID());
 		return;
 	}
 
diff --git a/src/add-ons/kernel/file_systems/netfs/client/VolumeSupport.h b/src/add-ons/kernel/file_systems/netfs/client/VolumeSupport.h
index e76512f603..df7fe0699a 100644
--- a/src/add-ons/kernel/file_systems/netfs/client/VolumeSupport.h
+++ b/src/add-ons/kernel/file_systems/netfs/client/VolumeSupport.h
@@ -31,7 +31,7 @@ next_dirent(struct dirent*& buffer, size_t& bufferSize)
 {
 	// align
 	char* nextBuffer = (char*)buffer + buffer->d_reclen;
-	nextBuffer = (char*)(((uint32)nextBuffer + 3) & ~0x3);
+	nextBuffer = (char*)(((addr_t)nextBuffer + 3) & ~0x3);
 
 	// check, if the buffer is at least large enough to align the current entry
 	int32 len = nextBuffer - (char*)buffer;
diff --git a/src/add-ons/kernel/file_systems/netfs/client/netfs.cpp b/src/add-ons/kernel/file_systems/netfs/client/netfs.cpp
index c68a9f0f58..91917a6c7f 100644
--- a/src/add-ons/kernel/file_systems/netfs/client/netfs.cpp
+++ b/src/add-ons/kernel/file_systems/netfs/client/netfs.cpp
@@ -669,8 +669,10 @@ netfs_read_dir(void *ns, void *_node, void *cookie, long *count,
 	Node* node = (Node*)_node;
 	PRINT("netfs_read_dir(%p, %p, %p, %ld, %p, %lu)\n", ns, node, cookie,
 		*count, buffer, bufferSize);
+	int32 _count = *count;
 	status_t error = node->GetVolume()->ReadDir(node, cookie, buffer,
-		bufferSize, *count, count);
+		bufferSize, _count, &_count);
+	*count = _count;
 	PRINT("netfs_read_dir() done: (%lx, %ld)\n", error, *count);
 	#if DEBUG
 		dirent* entry = buffer;
@@ -767,8 +769,10 @@ netfs_read_attrdir(void *ns, void *_node, void *cookie, long *count,
 	Node* node = (Node*)_node;
 	PRINT("netfs_read_attrdir(%p, %p, %p, %ld, %p, %lu)\n", ns, node,
 		cookie, *count, buffer, bufferSize);
+	int32 _count = *count;
 	status_t error = node->GetVolume()->ReadAttrDir(node, cookie, buffer,
-		bufferSize, *count, count);
+		bufferSize, _count, &_count);
+	*count = _count;
 	PRINT("netfs_read_attrdir() done: (%lx, %ld)\n", error, *count);
 	return error;
 }
@@ -928,8 +932,10 @@ netfs_read_query(void *ns, void *cookie, long *count,
 
 	status_t error = B_BAD_VALUE;
 	if (volume) {
+		int32 _count = *count;
 		error = volume->ReadQuery(iterator, buffer, bufferSize,
-		*count, count);
+			_count, &_count);
+		*count = _count;
 	}
 
 	PRINT("netfs_read_query() done: (%lx, %ld)\n", error, *count);
diff --git a/src/add-ons/kernel/file_systems/netfs/headers/shared/DebugSupport.h b/src/add-ons/kernel/file_systems/netfs/headers/shared/DebugSupport.h
index 8e0dc49995..07c7be1d96 100644
--- a/src/add-ons/kernel/file_systems/netfs/headers/shared/DebugSupport.h
+++ b/src/add-ons/kernel/file_systems/netfs/headers/shared/DebugSupport.h
@@ -100,14 +100,14 @@ void dbg_printf_end();
 #define DEBUG_CONTEXT(x)													\
 {																			\
 	dbg_printf_begin();														\
-	__out(DEBUG_APP " [%Ld: %5ld] ", system_time(), DEBUG_THREAD);			\
+	__out(DEBUG_APP " [%" B_PRIdBIGTIME ": %5" B_PRId32 "] ", system_time(), DEBUG_THREAD);			\
 	x;																		\
 	dbg_printf_end();														\
 }
 #define DEBUG_CONTEXT_FUNCTION(prefix, x)									\
 {																			\
 	dbg_printf_begin();														\
-	__out(DEBUG_APP " [%Ld: %5ld] %s" prefix, system_time(), DEBUG_THREAD,	\
+	__out(DEBUG_APP " [%" B_PRIdBIGTIME ": %5" B_PRId32 "] %s" prefix, system_time(), DEBUG_THREAD,	\
 		__PRETTY_FUNCTION__);												\
 	x;																		\
 	dbg_printf_end();														\
@@ -115,7 +115,7 @@ void dbg_printf_end();
 #define DEBUG_CONTEXT_LINE(x)												\
 {																			\
 	dbg_printf_begin();														\
-	__out(DEBUG_APP " [%Ld: %5ld] %s:%d: ", system_time(), DEBUG_THREAD,	\
+	__out(DEBUG_APP " [%" B_PRIdBIGTIME ": %5" B_PRId32 "] %s:%d: ", system_time(), DEBUG_THREAD,	\
 		__PRETTY_FUNCTION__, __LINE__);										\
 	x;																		\
 	dbg_printf_end();														\
diff --git a/src/add-ons/kernel/file_systems/netfs/shared/NetAddress.cpp b/src/add-ons/kernel/file_systems/netfs/shared/NetAddress.cpp
index d68bea0306..f978504701 100644
--- a/src/add-ons/kernel/file_systems/netfs/shared/NetAddress.cpp
+++ b/src/add-ons/kernel/file_systems/netfs/shared/NetAddress.cpp
@@ -144,11 +144,11 @@ NetAddress::GetString(HashString* string, bool includePort) const
 	char buffer[32];
 	uint32 ip = GetIP();
 	if (includePort) {
-		sprintf(buffer, "%lu.%lu.%lu.%lu:%hu",
-			ip >> 24, (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff,
+		sprintf(buffer, "%" B_PRIu32 ".%" B_PRIu32 ".%" B_PRIu32 ".%" B_PRIu32
+			":%hu", ip >> 24, (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff,
 			GetPort());
 	} else {
-		sprintf(buffer, "%lu.%lu.%lu.%lu",
+		sprintf(buffer, "%" B_PRIu32 ".%" B_PRIu32 ".%" B_PRIu32 ".%" B_PRIu32,
 			ip >> 24, (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff);
 	}
 	return (string->SetTo(buffer) ? B_OK : B_NO_MEMORY);
diff --git a/src/add-ons/kernel/file_systems/netfs/shared/RequestChannel.cpp b/src/add-ons/kernel/file_systems/netfs/shared/RequestChannel.cpp
index f084cadc24..4d871b28e8 100644
--- a/src/add-ons/kernel/file_systems/netfs/shared/RequestChannel.cpp
+++ b/src/add-ons/kernel/file_systems/netfs/shared/RequestChannel.cpp
@@ -170,7 +170,7 @@ RequestChannel::SendRequest(Request* request)
 		RETURN_ERROR(error);
 	if (size < 0 || size > kMaxSaneRequestSize) {
 		ERROR("RequestChannel::SendRequest(): ERROR: Invalid request size: "
-			"%ld\n", size);
+			"%" B_PRId32 "\n", size);
 		RETURN_ERROR(B_BAD_DATA);
 	}
 
@@ -209,7 +209,7 @@ RequestChannel::ReceiveRequest(Request** _request)
 	header.size = B_HOST_TO_BENDIAN_INT32(header.size);
 	if (header.size < 0 || header.size > kMaxSaneRequestSize) {
 		ERROR("RequestChannel::ReceiveRequest(): ERROR: Invalid request size: "
-			"%ld\n", header.size);
+			"%" B_PRId32 "\n", header.size);
 		RETURN_ERROR(B_BAD_DATA);
 	}