diff --git a/reactos/bootdata/hivesys.inf b/reactos/bootdata/hivesys.inf
index fca4719bb5e..d59b5c5471d 100644
--- a/reactos/bootdata/hivesys.inf
+++ b/reactos/bootdata/hivesys.inf
@@ -257,8 +257,8 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Type",0x00010001,0x00000010
 
 ; Scsiport driver
 HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","Group"="SCSI Port"
-HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","ImagePath"=expand:"system32\drivers\scsiport.sys"
+HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","Group",0x00000000,"SCSI Port"
+HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","ImagePath",0x00020000,"system32\drivers\scsiport.sys"
 HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","Start",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","Type",0x00010001,0x00000001
 
@@ -315,7 +315,7 @@ HKLM,"SYSTEM\Select","LastKnownGood",0x00010001,0x00000000
 ; System setup settings
 HKLM,"SYSTEM\Setup","CmdLine",0x00000000,"setup -newsetup"
 HKLM,"SYSTEM\Setup","OsLoaderPath",0x00000000,"\"
-HKLM,"SYSTEM\Setup","SetupType"0x00010001,0x00000000
+HKLM,"SYSTEM\Setup","SetupType",0x00010001,0x00000000
 HKLM,"SYSTEM\Setup","SystemPartition",0x00000000,"\Device\Harddisk0\Partition1"
 HKLM,"SYSTEM\Setup","SystemSetupInProgress",0x00010001,0x00000000
 
diff --git a/reactos/bootdata/txtsetup.sif b/reactos/bootdata/txtsetup.sif
index 3707eb2ae9d..557957962ef 100644
--- a/reactos/bootdata/txtsetup.sif
+++ b/reactos/bootdata/txtsetup.sif
@@ -84,7 +84,7 @@ autochk.exe  = 2
 gstart.exe   = 2
 ;lsass.exe    = 2
 services.exe = 2
-shell.exe    = 2
+cmd.exe      = 2
 winlogon.exe = 2
 
 win32k.sys   = 2
@@ -96,9 +96,3 @@ system.hiv   = 4
 
 [SetupData]
 DefaultPath = \ReactOS
-
-[AddReg]
-HKLM,"System\Setup",00,01,02,03,04,05,0a,a0,ac,ff
-HKLM,"System\Setup","SetupType",0x00010003,1
-HKCU,"Xxxx\XX","bla"
-HKCR,"Fasel","Tick",0x00000001