diff --git a/win32ss/gdi/ntgdi/fillshap.c b/win32ss/gdi/ntgdi/fillshap.c
index f0d08d8505b..c01ae97d7b6 100644
--- a/win32ss/gdi/ntgdi/fillshap.c
+++ b/win32ss/gdi/ntgdi/fillshap.c
@@ -137,8 +137,6 @@ IntGdiPolygon(PDC    dc,
                 PATH_UnlockPath(pPath);
                 PATH_Delete(dc->dclevel.hPath);
                 dc->dclevel.hPath = NULL;
-
-                /* FIXME: Boundary */
             }
             else
             {
@@ -695,8 +693,6 @@ IntRectangle(PDC dc,
             PATH_UnlockPath(pPath);
             PATH_Delete(dc->dclevel.hPath);
             dc->dclevel.hPath = NULL;
-
-            /* FIXME: Boundary */
         }
         else
         {
diff --git a/win32ss/gdi/ntgdi/line.c b/win32ss/gdi/ntgdi/line.c
index c61f62db7a0..9e3ff20c824 100644
--- a/win32ss/gdi/ntgdi/line.c
+++ b/win32ss/gdi/ntgdi/line.c
@@ -31,7 +31,7 @@ AddPenLinesBounds(PDC dc, int count, POINT *points)
     bounds.left = bounds.top = INT_MAX;
     bounds.right = bounds.bottom = INT_MIN;
 
-    if (IntIsEffectiveWidePen(pbrLine))
+    if (((pbrLine->ulPenStyle & PS_TYPE_MASK) & PS_GEOMETRIC) || pbrLine->lWidth > 1)
     {
         /* Windows uses some heuristics to estimate the distance from the point that will be painted */
         lWidth = pbrLine->lWidth + 2;
@@ -230,8 +230,6 @@ IntGdiLineTo(DC  *dc,
                 PATH_UnlockPath(pPath);
                 PATH_Delete(dc->dclevel.hPath);
                 dc->dclevel.hPath = NULL;
-
-                /* FIXME: Boundary */
             }
             else
             {
@@ -398,8 +396,6 @@ IntGdiPolyline(DC      *dc,
                 PATH_UnlockPath(pPath);
                 PATH_Delete(dc->dclevel.hPath);
                 dc->dclevel.hPath = NULL;
-
-                /* FIXME: Boundary */
             }
             else
             {