diff --git a/reactos/ntoskrnl/ex/win32k.c b/reactos/ntoskrnl/ex/win32k.c
index a5dd22a83b1..6d969f5ef80 100644
--- a/reactos/ntoskrnl/ex/win32k.c
+++ b/reactos/ntoskrnl/ex/win32k.c
@@ -69,7 +69,7 @@ ExpWinStaObjectDelete(PVOID DeletedObject)
 
 PVOID
 STDCALL
-ExpWinStaObjectFind(PWINSTATION_OBJECT WinStaObject,
+ExpWinStaObjectFind(PVOID WinStaObject,
                     PWSTR Name,
                     ULONG Attributes)
 {
@@ -130,7 +130,6 @@ ExpWin32kInit(VOID)
     RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer));
     RtlInitUnicodeString(&Name, L"WindowStation");
     ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer);
-    ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(WINSTATION_OBJECT);
     ObjectTypeInitializer.GenericMapping = ExpWindowStationMapping;
     ObjectTypeInitializer.PoolType = NonPagedPool;
     ObjectTypeInitializer.UseDefaultObject = TRUE;
@@ -141,7 +140,6 @@ ExpWin32kInit(VOID)
 
     /* Create desktop object type */
     RtlInitUnicodeString(&Name, L"Desktop");
-    ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(DESKTOP_OBJECT);
     ObjectTypeInitializer.GenericMapping = ExpDesktopMapping;
     ObjectTypeInitializer.OpenProcedure = NULL;
     ObjectTypeInitializer.DeleteProcedure = ExpDesktopDelete;
diff --git a/reactos/subsys/system/directory.xml b/reactos/subsys/system/directory.xml
index 143d6269de8..7a8a94f1638 100644
--- a/reactos/subsys/system/directory.xml
+++ b/reactos/subsys/system/directory.xml
@@ -13,12 +13,6 @@
 <directory name="expand">
 	<xi:include href="expand/expand.xml" />
 </directory>
-<directory name="explorer">
-	<xi:include href="explorer/explorer.xml" />
-</directory>
-<directory name="ibrowser">
-	<xi:include href="ibrowser/ibrowser.xml" />
-</directory>
 <directory name="format">
 	<xi:include href="format/format.xml" />
 </directory>
diff --git a/reactos/subsys/win32k/ntuser/desktop.c b/reactos/subsys/win32k/ntuser/desktop.c
index fd2904213af..c74a9c2246e 100644
--- a/reactos/subsys/win32k/ntuser/desktop.c
+++ b/reactos/subsys/win32k/ntuser/desktop.c
@@ -44,6 +44,10 @@ BOOL g_PaintDesktopVersion = FALSE;
 NTSTATUS FASTCALL
 InitDesktopImpl(VOID)
 {
+   /* Set Desktop Object Attributes */
+   ExDesktopObjectType->TypeInfo.DefaultNonPagedPoolCharge = sizeof(DESKTOP_OBJECT);
+   /* FIXME: Set Generic Mapping correctly */
+   
   return STATUS_SUCCESS;
 }
 
diff --git a/reactos/subsys/win32k/ntuser/winsta.c b/reactos/subsys/win32k/ntuser/winsta.c
index c842ebc56f7..bc2123d7326 100644
--- a/reactos/subsys/win32k/ntuser/winsta.c
+++ b/reactos/subsys/win32k/ntuser/winsta.c
@@ -70,7 +70,11 @@ InitWindowStationImpl(VOID)
 	     "(Status 0x%X)\n", Status);
       return Status;
    }
-
+   
+   /* Set Winsta Object Attributes */
+   ExWindowStationObjectType->TypeInfo.DefaultNonPagedPoolCharge =   sizeof(WINSTATION_OBJECT);
+   /* FIXME: Set Generic Mapping correctly */
+   
    return STATUS_SUCCESS;
 }