diff --git a/reactos/subsystems/win32/win32k/ntuser/misc.c b/reactos/subsystems/win32/win32k/ntuser/misc.c
index b55c51e319b..46730cccfaf 100644
--- a/reactos/subsystems/win32/win32k/ntuser/misc.c
+++ b/reactos/subsystems/win32/win32k/ntuser/misc.c
@@ -954,6 +954,10 @@ IntSystemParametersInfo(
 
    switch(uiAction)
    {
+     case SPI_GETDRAGFULLWINDOWS:
+           /* FIXME: Implement this, don't just return constant */ 
+           *(PBOOL)pvParam = FALSE;
+           break;
       case SPI_GETKEYBOARDCUES:
       case SPI_SETDOUBLECLKWIDTH:
       case SPI_SETDOUBLECLKHEIGHT:
@@ -1739,13 +1743,13 @@ UserSystemParametersInfo(
           }
       case SPI_GETNONCLIENTMETRICS:
           {
-              NONCLIENTMETRICS Buffer;  
+              NONCLIENTMETRICSW Buffer;  
               return UserSystemParametersInfo_StructGet(uiAction, uiParam, pvParam, fWinIni,
                   &Buffer,sizeof(Buffer));
           }
       case SPI_SETNONCLIENTMETRICS:
           {
-              NONCLIENTMETRICS Buffer;  
+              NONCLIENTMETRICSW Buffer;  
               return UserSystemParametersInfo_StructSet(uiAction, uiParam, pvParam, fWinIni,
                   &Buffer,sizeof(Buffer));
           }
@@ -1785,30 +1789,6 @@ UserSystemParametersInfo(
               return UserSystemParametersInfo_StructSet(uiAction, uiParam, pvParam, fWinIni,
                   &Buffer,sizeof(Buffer));
           }
-      case SPI_GETHIGHCONTRAST:
-          {
-              HIGHCONTRAST Buffer;  
-              return UserSystemParametersInfo_StructGet(uiAction, uiParam, pvParam, fWinIni,
-                  &Buffer,sizeof(Buffer));
-          }
-      case SPI_SETHIGHCONTRAST:
-          {
-              HIGHCONTRAST Buffer;  
-              return UserSystemParametersInfo_StructSet(uiAction, uiParam, pvParam, fWinIni,
-                  &Buffer,sizeof(Buffer));
-          }
-      case SPI_GETSOUNDSENTRY:
-          {
-              SOUNDSENTRY Buffer;  
-              return UserSystemParametersInfo_StructGet(uiAction, uiParam, pvParam, fWinIni,
-                  &Buffer,sizeof(Buffer));
-          }
-      case SPI_SETSOUNDSENTRY:
-          {
-              SOUNDSENTRY Buffer;  
-              return UserSystemParametersInfo_StructSet(uiAction, uiParam, pvParam, fWinIni,
-                  &Buffer,sizeof(Buffer));
-          }
       case SPI_GETSTICKYKEYS:
           {
               STICKYKEYS Buffer;  
@@ -2041,6 +2021,15 @@ UserSystemParametersInfo(
               }
               return( TRUE);
           }
+      case SPI_GETHIGHCONTRAST:
+      case SPI_SETHIGHCONTRAST:
+      case SPI_GETSOUNDSENTRY:
+      case SPI_SETSOUNDSENTRY:
+          {
+              /* FIXME: Support this accessibility SPI actions */
+              DPRINT1("FIXME: Unsupported SPI Code: %lx \n",uiAction );
+              break;
+          }
       default :
 		  {
               SetLastNtError(ERROR_INVALID_PARAMETER);