4 files changed, 24 insertions, 10 deletions
diff --git a/dev/Boot/BootKit/BootKit.h b/dev/Boot/BootKit/BootKit.h
index 09313830..86b6e4c5 100644
--- a/dev/Boot/BootKit/BootKit.h
+++ b/dev/Boot/BootKit/BootKit.h
@@ -353,8 +353,8 @@ namespace Boot
 
 		BOOT_BLOCK_STRUCT epm_boot{0};
 
-		constexpr auto kFsName	  = "NeFS";
-		constexpr auto kBlockName = "ZKA:";
+		const auto kFsName	  = "NeFS";
+		const auto kBlockName = "OS";
 
 		CopyMem(epm_boot.Fs, reinterpret_cast<VoidPtr>(const_cast<Char*>(kFsName)), StrLen(kFsName));
 
diff --git a/dev/Boot/Mod/SysChk/Module.cc b/dev/Boot/Mod/SysChk/Module.cc
index 4073ec11..09a7a718 100644
--- a/dev/Boot/Mod/SysChk/Module.cc
+++ b/dev/Boot/Mod/SysChk/Module.cc
@@ -24,5 +24,9 @@
 EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* handover)
 {
 	Boot::BDiskFormatFactory<BootDeviceATA> partition_factory;
-	return (!partition_factory.IsPartitionValid()) ? kEfiFail : kEfiOk;
+
+	if (partition_factory.IsPartitionValid())
+		return kEfiOk;
+	
+	return kEfiFail;
 }
diff --git a/dev/Boot/src/HEL/AMD64/BootATA.cc b/dev/Boot/src/HEL/AMD64/BootATA.cc
index cdf0d180..4222792f 100644
--- a/dev/Boot/src/HEL/AMD64/BootATA.cc
+++ b/dev/Boot/src/HEL/AMD64/BootATA.cc
@@ -169,6 +169,8 @@ Void boot_ata_write(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf,
 		rt_out16(IO + ATA_REG_DATA, Buf[IndexOff]);
 		boot_ata_wait_io(IO);
 	}
+
+	boot_ata_wait_io(IO);
 }
 
 /// @check is ATA detected?
@@ -246,8 +248,11 @@ BootDeviceATA& BootDeviceATA::Write(CharacterTypeUTF8* Buf, const SizeT& SectorS
 
 	Leak().mErr = false;
 
-	if (!Buf || SectorSz < 1)
+	if (!Buf || SectorSz < 1 || this->Leak().mSize < 1)
+	{
+		Leak().mErr = true;
 		return *this;
+	}
 
 	boot_ata_write(this->Leak().mBase, this->Leak().mBus, this->Leak().mMaster,
 				   Buf, SectorSz, this->Leak().mSize);
diff --git a/dev/Boot/src/HEL/AMD64/BootMain.cc b/dev/Boot/src/HEL/AMD64/BootMain.cc
index 6744438f..da618625 100644
--- a/dev/Boot/src/HEL/AMD64/BootMain.cc
+++ b/dev/Boot/src/HEL/AMD64/BootMain.cc
@@ -222,16 +222,21 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	image_handle,
 
 	if (syschk_thread->Start(handover_hdr, NO) != kEfiOk)
 	{
-		fb_init();
+		if (partition_factory.IsPartitionValid() == NO)
+		{
+			Boot::BDiskFormatFactory<BootDeviceATA>::BFileDescriptor root{};
 
-		Boot::BDiskFormatFactory<BootDeviceATA>::BFileDescriptor root{};
+			root.fFileName[0] = kNeFSRoot[0];
+			root.fFileName[1] = 0;
 
-		root.fFileName[0] = kNeFSRoot[0];
-		root.fFileName[1] = 0;
+			root.fKind = kNeFSCatalogKindDir;
 
-		root.fKind = kNeFSCatalogKindDir;
+			const auto kFSName = "SSD";
 
-		partition_factory.Format("HD", &root, 1);
+			partition_factory.Format(kFSName, &root, 1);
+		}
+
+		fb_init();
 
 		UI::fb_clear_video();