diff --git a/reactos/bootdata/hivecls.inf b/reactos/bootdata/hivecls.inf
index 94e1d142e8d..7208efdc77a 100644
--- a/reactos/bootdata/hivecls.inf
+++ b/reactos/bootdata/hivecls.inf
@@ -62,6 +62,13 @@ HKCR,"Msi.Package\shell\Open\command","",0x00020000,"%SystemRoot%\System32\msiex
 HKCR,"Msi.Package\shell\Repair\command","",0x00020000,"%SystemRoot%\System32\msiexec /f %1"
 HKCR,"Msi.Package\shell\Uninstall\command","",0x00020000,"%SystemRoot%\System32\msiexec /x %1"
 
+; set MIME type for .html and .htm because Tiny webserver needs it
+HKCR,".htm","",0x00000000,"html"
+HKCR,".htm","Content Type",0x00000000,"text/html"
+
+HKCR,".html","",0x00000000,"html"
+HKCR,".html","Content Type",0x00000000,"text/html"
+
 HKCR,"CLSID",,0x00000012
 
 ; For Shell32.dll
diff --git a/reactos/lib/advapi32/reg/reg.c b/reactos/lib/advapi32/reg/reg.c
index 9f14c5ee35c..e7c06d0749e 100644
--- a/reactos/lib/advapi32/reg/reg.c
+++ b/reactos/lib/advapi32/reg/reg.c
@@ -2507,7 +2507,7 @@ RegGetKeySecurity(HKEY hKey,
       TRACE("MapDefaultKey() failed (Status %lx)\n", Status);
       return RtlNtStatusToDosError (Status);
     }
-#ifndef __REACTOS__
+#if 0
   Status = NtQuerySecurityObject(KeyHandle,
 				 SecurityInformation,
 				 pSecurityDescriptor,
@@ -3185,7 +3185,7 @@ RegQueryInfoKeyW (HKEY hKey,
     {
       *lpcbMaxValueLen = FullInfo->MaxValueDataLen;
     }
-#ifndef __REACTOS__ 
+#if 0
   if (lpcbSecurityDescriptor != NULL)
     {
       Status = NtQuerySecurityObject(KeyHandle,