diff --git a/src/add-ons/kernel/file_systems/packagefs/Volume.cpp b/src/add-ons/kernel/file_systems/packagefs/Volume.cpp
index 40edec2537..cb19c1fd0f 100644
--- a/src/add-ons/kernel/file_systems/packagefs/Volume.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/Volume.cpp
@@ -99,7 +99,7 @@ struct Volume::DomainDirectoryEventJob : Job {
 		:
 		Job(volume),
 		fDomain(domain),
-		fEvent(NULL)
+		fEvent()
 	{
 		fDomain->AcquireReference();
 	}
diff --git a/src/add-ons/kernel/file_systems/packagefs/Volume.h b/src/add-ons/kernel/file_systems/packagefs/Volume.h
index 99a9b8e501..169e143383 100644
--- a/src/add-ons/kernel/file_systems/packagefs/Volume.h
+++ b/src/add-ons/kernel/file_systems/packagefs/Volume.h
@@ -57,6 +57,10 @@ private:
 			struct PackageLoaderContentHandler;
 			struct DomainDirectoryListener;
 
+			friend struct AddPackageDomainJob;
+			friend struct DomainDirectoryEventJob;
+			friend struct DomainDirectoryListener;
+
 			typedef DoublyLinkedList<Job> JobList;
 			typedef DoublyLinkedList<PackageDomain> PackageDomainList;