diff --git a/reactos/win32ss/user/ntuser/csr.c b/reactos/win32ss/user/ntuser/csr.c
index c23a0f042a5..e9f7d139745 100644
--- a/reactos/win32ss/user/ntuser/csr.c
+++ b/reactos/win32ss/user/ntuser/csr.c
@@ -3,7 +3,7 @@
  * PROJECT:          ReactOS Win32k subsystem
  * PURPOSE:          Interface between Win32k and USERSRV
  * FILE:             win32ss/user/ntuser/csr.c
- * PROGRAMER:        Hermes Belusca-Maito (hermes.belusca@sfr.fr), based on
+ * PROGRAMMER:       Hermes Belusca-Maito (hermes.belusca@sfr.fr), based on
  *                   the original code by Ge van Geldorp (ge@gse.nl) and by
  *                   the CSR code in NTDLL.
  */
diff --git a/reactos/win32ss/user/ntuser/defwnd.c b/reactos/win32ss/user/ntuser/defwnd.c
index 6336a4e102f..66f20ecdd0b 100644
--- a/reactos/win32ss/user/ntuser/defwnd.c
+++ b/reactos/win32ss/user/ntuser/defwnd.c
@@ -397,9 +397,8 @@ UserPaintCaption(PWND pWnd, INT Flags)
 {
   BOOL Ret = FALSE;
 
-  if ( pWnd->style & WS_VISIBLE && (pWnd->style & WS_CAPTION) == WS_CAPTION )
+  if ( (pWnd->style & WS_VISIBLE) && ((pWnd->style & WS_CAPTION) == WS_CAPTION) )
   {
-  
       if (pWnd->state & WNDS_HASCAPTION && pWnd->head.pti->MessageQueue == gpqForeground)
          Flags |= DC_ACTIVE;
     /* 
diff --git a/reactos/win32ss/user/ntuser/hook.c b/reactos/win32ss/user/ntuser/hook.c
index 64155091bd5..0f1ae60308d 100644
--- a/reactos/win32ss/user/ntuser/hook.c
+++ b/reactos/win32ss/user/ntuser/hook.c
@@ -103,7 +103,7 @@ IntHookModuleUnloaded(PDESKTOP pdesk, int iHookID, HHOOK hHook)
 
         /* FIXME: Do some more security checks here */
 
-        /* FIXME: The first check is a reactos specific hack for system threads */
+        /* FIXME: HACK: The first check is a reactos specific hack for system threads */
         if(!PsIsSystemProcess(ptiCurrent->ppi->peProcess) &&
            ptiCurrent->ppi != ppiCsr)
         {
diff --git a/reactos/win32ss/user/ntuser/winpos.c b/reactos/win32ss/user/ntuser/winpos.c
index 0d9afbe0258..82533490ce8 100644
--- a/reactos/win32ss/user/ntuser/winpos.c
+++ b/reactos/win32ss/user/ntuser/winpos.c
@@ -724,8 +724,8 @@ WinPosFindIconPos(PWND Window, POINT *Pos)
    pwndParent = Window->spwndParent;
    if (pwndParent == UserGetDesktopWindow())
    {
-      ERR("Parent is Desktop, Min off screen!\n");
-      /* ReactOS doesn't support iconic minimize to desktop */
+      ERR("FIXME: Parent is Desktop, Min off screen!\n");
+      /* FIXME: ReactOS doesn't support iconic minimize to desktop */
       Pos->x = Pos->y = -32000;
       Window->InternalPos.flags |= WPF_MININIT;
       Window->InternalPos.IconPos.x = Pos->x;