diff --git a/build/jam/NetBootArchive b/build/jam/NetBootArchive
index b4caea43e1..83bc2b303c 100644
--- a/build/jam/NetBootArchive
+++ b/build/jam/NetBootArchive
@@ -42,7 +42,7 @@ AddFilesToNetBootArchive beos system add-ons kernel console : vga_text ;
 AddFilesToNetBootArchive beos system add-ons kernel file_systems
 	: $(BEOS_ADD_ONS_FILE_SYSTEMS) ;
 AddFilesToNetBootArchive beos system add-ons kernel generic
-	: block_io fast_log ide_adapter locked_pool scsi_periph ;
+	: block_io ide_adapter locked_pool scsi_periph ;
 AddFilesToNetBootArchive beos system add-ons kernel partitioning_systems
 	: intel session ;
 AddFilesToNetBootArchive beos system add-ons kernel interrupt_controllers
@@ -53,8 +53,8 @@ if $(TARGET_ARCH) = x86 {
 }
 
 # drivers
-AddDriversToNetBootArchive disk scsi	: scsi_cd scsi_dsk ;
-#AddDriversToNetBootArchive disk virtual	: nbd ;
+AddDriversToNetBootArchive disk scsi	: scsi_cd scsi_disk ;
+#AddDriversToNetBootArchive disk virtual : nbd ;
 AddDriversToNetBootArchive disk virtual	: remote_disk ;
 AddDriversToNetBootArchive net			: $(BEOS_ADD_ONS_DRIVERS_NET) ;
 
@@ -86,7 +86,7 @@ AddBootModuleSymlinksToNetBootArchive
 	$(BEOS_ADD_ONS_BUS_MANAGERS)
 	ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112
 	$(BEOS_ADD_ONS_FILE_SYSTEMS)
-	block_io fast_log ide_adapter locked_pool scsi_periph
+	block_io ide_adapter locked_pool scsi_periph
 	intel session
 	$(PPC_ONLY)openpic
 	$(X86_ONLY)generic_x86
@@ -95,7 +95,7 @@ AddBootModuleSymlinksToNetBootArchive
 	$(BEOS_ADD_ONS_DRIVERS_NET)
 	stack
 	$(BEOS_NETWORK_DEVICES)
-	$(BEOS_NETWORK_DATALINK_PROTOCOLS) 
+	$(BEOS_NETWORK_DATALINK_PROTOCOLS)
 	$(BEOS_NETWORK_PPP)
 	$(BEOS_NETWORK_PROTOCOLS)
 ;
diff --git a/src/add-ons/kernel/drivers/disk/virtual/remote_disk/Jamfile b/src/add-ons/kernel/drivers/disk/virtual/remote_disk/Jamfile
index de55ad9a08..be88a27141 100644
--- a/src/add-ons/kernel/drivers/disk/virtual/remote_disk/Jamfile
+++ b/src/add-ons/kernel/drivers/disk/virtual/remote_disk/Jamfile
@@ -1,9 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers disk virtual remote_disk ;
 
-UsePrivateHeaders kernel ;
-UseArchHeaders $(TARGET_ARCH) ;
-UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
-	# TODO: Ugly!
+UsePrivateKernelHeaders ;
+UsePrivateSystemHeaders ;
 
 KernelAddon remote_disk :
 	remote_disk.cpp
diff --git a/src/add-ons/kernel/drivers/disk/virtual/remote_disk/remote_disk.cpp b/src/add-ons/kernel/drivers/disk/virtual/remote_disk/remote_disk.cpp
index ddc62959f5..193811c081 100644
--- a/src/add-ons/kernel/drivers/disk/virtual/remote_disk/remote_disk.cpp
+++ b/src/add-ons/kernel/drivers/disk/virtual/remote_disk/remote_disk.cpp
@@ -35,10 +35,10 @@ struct RemoteDiskDevice : recursive_lock {
 	bigtime_t		lastInitRetryTime;
 
 	RemoteDiskDevice()
-		: remoteDisk(NULL),
-		  lastInitRetryTime(-1)
+		:
+		remoteDisk(NULL),
+		lastInitRetryTime(-1)
 	{
-		sem = -1;
 	}
 
 	~RemoteDiskDevice()
@@ -236,7 +236,7 @@ remote_disk_control(void* cookie, uint32 op, void* arg, size_t len)
 			*(bool*)arg = true;
 			return B_OK;
 
-		case B_GET_WRITE_STATUS:		
+		case B_GET_WRITE_STATUS:
 			TRACE(("remote_disk: B_GET_WRITE_STATUS\n"));
 			*(bool*)arg = true;
 			return B_OK;