diff --git a/reactos/subsystems/win32/win32k/include/tags.h b/reactos/subsystems/win32/win32k/include/tags.h
index 4a9691ab5cc..e705b6b923d 100644
--- a/reactos/subsystems/win32/win32k/include/tags.h
+++ b/reactos/subsystems/win32/win32k/include/tags.h
@@ -62,7 +62,6 @@
 #define TAG_COORD       TAG('C', 'O', 'R', 'D') /* coords */
 #define TAG_GDIDEV      TAG('G', 'd', 'e', 'v') /* gdi dev support*/
 #define TAG_GDIPDEV     TAG('G', 'D', 'e', 'v') /* gdi PDev */
-#define TAG_GDIOBJ      TAG('G', 'D', 'I', 'O') /* gdi obj */
 #define TAG_GDIHNDTBLE  TAG('G', 'D', 'I', 'H') /* gdi handle table */
 #define TAG_GDIICM      TAG('G', 'i', 'c', 'm') /* gdi Icm */
 #define TAG_DIB         TAG('D', 'I', 'B', ' ') /* dib */
@@ -71,13 +70,13 @@
 #define TAG_PALETTEMAP  TAG('P', 'A', 'L', 'M') /* palette mapping */
 #define TAG_PRINT       TAG('P', 'R', 'N', 'T') /* print */
 #define TAG_GDITEXT     TAG('T', 'X', 'T', 'O') /* text */
-#define TAG_EXTPEN      TAG('X', 'P', 'E', 'N') /* extpen */
+#define TAG_PENSTYLES   TAG('G', 's', 't', 'y') /* pen styles */
 
 /* Eng objects */
 #define TAG_CLIPOBJ     TAG('C', 'L', 'P', 'O') /* clip object */
 #define TAG_DRIVEROBJ   TAG('D', 'R', 'V', 'O') /* driver object */
 #define TAG_FONT        TAG('F', 'N', 'T', 'E') /* font entry */
-#define TAG_FONTOBJ     TAG('F', 'N', 'T', 'O') /* font object */
+#define TAG_FONTOBJ     TAG('G', 'f', 'n', 't') /* font object */
 #define TAG_WNDOBJ      TAG('W', 'N', 'D', 'O') /* window object */
 #define TAG_XLATEOBJ    TAG('X', 'L', 'A', 'O') /* xlate object */
 #define TAG_BITMAPOBJ   TAG('B', 'M', 'P', 'O') /* bitmap object */
diff --git a/reactos/subsystems/win32/win32k/objects/pen.c b/reactos/subsystems/win32/win32k/objects/pen.c
index 018c9d71067..64c273b1b58 100644
--- a/reactos/subsystems/win32/win32k/objects/pen.c
+++ b/reactos/subsystems/win32/win32k/objects/pen.c
@@ -301,7 +301,7 @@ NtGdiExtCreatePen(
 
    if (dwStyleCount > 0)
    {
-      pSafeStyle = ExAllocatePoolWithTag(NonPagedPool, dwStyleCount * sizeof(DWORD), TAG_EXTPEN);
+      pSafeStyle = ExAllocatePoolWithTag(NonPagedPool, dwStyleCount * sizeof(DWORD), TAG_PENSTYLES);
       if (!pSafeStyle)
       {
          SetLastNtError(ERROR_NOT_ENOUGH_MEMORY);
@@ -338,7 +338,12 @@ NtGdiExtCreatePen(
                              cjDIB,
                              bOldStylePen,
                              hBrush);
-// BRUSH_Cleanup takes care of pSafeStyle
+
+   if (!hPen && pSafeStyle)
+   {
+      ExFreePool(pSafeStyle);
+   }
+// BRUSH_Cleanup takes care of pSafeStyle when deleteing the pen
    return hPen;
 }