6 files changed, 22 insertions, 19 deletions
diff --git a/dev/Kernel/src/DriveMgr.cc b/dev/Kernel/src/DriveMgr.cc
index 95e5b988..8e8d5ab2 100644
--- a/dev/Kernel/src/DriveMgr.cc
+++ b/dev/Kernel/src/DriveMgr.cc
@@ -204,7 +204,11 @@ namespace Kernel
 	{
 		DriveTrait trait{};
 
-		rt_copy_memory((VoidPtr) "/Disks/OS:", trait.fName, rt_string_len("/Disks/OS:"));
+		const auto kMainDrive = "/Mount/OS:";
+
+		rt_copy_memory((VoidPtr)kMainDrive, trait.fName, rt_string_len(kMainDrive));
+
+		MUST_PASS(trait.fName[0] != 0);
 
 		trait.fVerify	 = io_drv_unimplemented;
 		trait.fOutput	 = io_drv_output;
diff --git a/dev/Kernel/src/FS/NeFS.cc b/dev/Kernel/src/FS/NeFS.cc
index 3dcf13da..b0a7c6c6 100644
--- a/dev/Kernel/src/FS/NeFS.cc
+++ b/dev/Kernel/src/FS/NeFS.cc
@@ -309,7 +309,7 @@ _Output NFS_CATALOG_STRUCT* NeFileSystemParser::CreateCatalog(_Input const Char*
 
 		return nullptr;
 	}
-	
+
 	constexpr SizeT kDefaultForkSize = kNeFSForkSize;
 
 	NFS_CATALOG_STRUCT* child_catalog = new NFS_CATALOG_STRUCT();
@@ -460,6 +460,7 @@ _Output NFS_CATALOG_STRUCT* NeFileSystemParser::CreateCatalog(_Input const Char*
 /// @return If it was sucessful, see err_global_get().
 bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const Lba endLba, _Input const Int32 flags, const Char* part_name)
 {
+#ifdef ZKA_EPM_SUPPORT
 	if (*part_name == 0 ||
 		endLba == 0)
 		return false;
@@ -490,14 +491,14 @@ bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const L
 	if (flags & kNeFSPartitionTypeBoot)
 	{
 		// make it bootable when needed.
-		Char bufEpmHdr[kNeFSSectorSz] = {0};
+		Char buf_epm[kNeFSSectorSz] = {0};
 
-		BOOT_BLOCK_STRUCT* epm_boot = (BOOT_BLOCK_STRUCT*)bufEpmHdr;
+		BOOT_BLOCK_STRUCT* epm_boot = (BOOT_BLOCK_STRUCT*)buf_epm;
 
 		// Write a new EPM entry.
 
 		constexpr auto kFsName	  = "NeFS";
-		constexpr auto kBlockName = "ZKA:";
+		constexpr auto kBlockName = "ZkaOS:";
 
 		rt_copy_memory(reinterpret_cast<VoidPtr>(const_cast<Char*>(kFsName)), epm_boot->Fs, rt_string_len(kFsName));
 
@@ -533,7 +534,7 @@ bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const L
 				epm_boot->LbaEnd	= endLba;
 				epm_boot->NumBlocks = cnt;
 
-				drive->fPacket.fPacketContent = bufEpmHdr;
+				drive->fPacket.fPacketContent = buf_epm;
 				drive->fPacket.fPacketSize	  = sizeof(EPM_BOOT_BLOCK);
 				drive->fPacket.fPacketLba	  = outEpmLba;
 
@@ -616,6 +617,7 @@ bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const L
 
 		drive->fInput(&drive->fPacket);
 	}
+#endif // ZKA_EPM_SUPPORT
 
 	return false;
 }
@@ -817,7 +819,6 @@ kNeFSSearchThroughCatalogList:
 				return nullptr;
 			}
 
-
 			/// ignore unallocated catalog, break
 			if (!(temporary_catalog.Flags & kNeFSFlagCreated))
 			{
@@ -846,8 +847,8 @@ kNeFSSearchThroughCatalogList:
 
 	if (local_search_first)
 	{
-		local_search_first  = false;
-		start_catalog_lba = kStartCatalogList;
+		local_search_first = false;
+		start_catalog_lba  = kStartCatalogList;
 
 		goto kNeFSSearchThroughCatalogList;
 	}
diff --git a/dev/Kernel/src/KernelMain.cc b/dev/Kernel/src/KernelMain.cc
index 58592a10..303b1d81 100644
--- a/dev/Kernel/src/KernelMain.cc
+++ b/dev/Kernel/src/KernelMain.cc
@@ -40,10 +40,10 @@ namespace Kernel::Detail
 
 			if (mNeFS)
 			{
-				const SizeT	   kFolderCount				= 8;
-				const Char*	   kFolderStr[kFolderCount] = {
-					   "/", "/Boot/", "/System/", "/Support/", "/Applications/",
-					   "/Users/", "/Library/", "/Mount/"};
+				const SizeT kFolderCount			 = 8;
+				const Char* kFolderStr[kFolderCount] = {
+					"/", "/Boot/", "/System/", "/Support/", "/Applications/",
+					"/Users/", "/Library/", "/Mount/"};
 
 				for (Kernel::SizeT dir_index = 0UL; dir_index < kFolderCount; ++dir_index)
 				{
diff --git a/dev/Kernel/src/PEFCodeMgr.cc b/dev/Kernel/src/PEFCodeMgr.cc
index 17f7f895..497e1f28 100644
--- a/dev/Kernel/src/PEFCodeMgr.cc
+++ b/dev/Kernel/src/PEFCodeMgr.cc
@@ -253,14 +253,12 @@ namespace Kernel
 			if (errOrStart.Error() != kErrorSuccess)
 				return kProcessInvalidID;
 
-			UserThread process;
-
 			auto id = UserProcessScheduler::The().Spawn(reinterpret_cast<const Char*>(exec.FindSymbol(kPefNameSymbol, kPefData)), errOrStart.Leak().Leak(), exec.GetBlob().Leak().Leak());
 
 			if (id != kProcessInvalidID)
 			{
-				UserProcessScheduler::The().CurrentTeam().AsArray()[id].Kind = process_kind; 
-				UserProcessScheduler::The().CurrentTeam().AsArray()[id].StackSize = *(UIntPtr*)exec.FindSymbol(kPefStackSizeSymbol, kPefData);
+				UserProcessScheduler::The().CurrentTeam().AsArray()[id].Kind		= process_kind;
+				UserProcessScheduler::The().CurrentTeam().AsArray()[id].StackSize	= *(UIntPtr*)exec.FindSymbol(kPefStackSizeSymbol, kPefData);
 				UserProcessScheduler::The().CurrentTeam().AsArray()[id].MemoryLimit = *(UIntPtr*)exec.FindSymbol(kPefHeapSizeSymbol, kPefData);
 			}
 
diff --git a/dev/Kernel/src/UserProcessScheduler.cc b/dev/Kernel/src/UserProcessScheduler.cc
index 85915e10..936d0547 100644
--- a/dev/Kernel/src/UserProcessScheduler.cc
+++ b/dev/Kernel/src/UserProcessScheduler.cc
@@ -547,7 +547,7 @@ namespace Kernel
 			auto prev_ptime										 = HardwareThreadScheduler::The()[index].Leak()->fPTime;
 			HardwareThreadScheduler::The()[index].Leak()->fPTime = UserProcessScheduler::The().CurrentTeam().AsArray()[new_pid].PTime;
 
-			Bool ret											 = HardwareThreadScheduler::The()[index].Leak()->Switch(image_ptr, stack, frame_ptr, new_pid);
+			Bool ret = HardwareThreadScheduler::The()[index].Leak()->Switch(image_ptr, stack, frame_ptr, new_pid);
 
 			////////////////////////////////////////////////////////////
 			///	Rollback on fail.    								 ///
diff --git a/dev/Kernel/src/UserProcessTeam.cc b/dev/Kernel/src/UserProcessTeam.cc
index a41160cc..aea75121 100644
--- a/dev/Kernel/src/UserProcessTeam.cc
+++ b/dev/Kernel/src/UserProcessTeam.cc
@@ -17,7 +17,7 @@ namespace Kernel
 	{
 		for (SizeT i = 0U; i < this->mProcessList.Count(); ++i)
 		{
-			this->mProcessList[i] = UserThread();
+			this->mProcessList[i]		 = UserThread();
 			this->mProcessList[i].Status = ProcessStatusKind::kKilled;
 		}