diff --git a/reactos/lib/comctl32/datetime.c b/reactos/lib/comctl32/datetime.c
index 85de9458f95..5bf8ddf2824 100644
--- a/reactos/lib/comctl32/datetime.c
+++ b/reactos/lib/comctl32/datetime.c
@@ -1170,10 +1170,10 @@ DATETIME_Size (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
   TRACE("Height=%ld, Width=%ld\n", infoPtr->rcClient.bottom, infoPtr->rcClient.right);
 
-  /* use DrawEdge to adjust the size of rcEdge to get rcDraw */
   memcpy((&infoPtr->rcDraw), (&infoPtr->rcClient), sizeof(infoPtr->rcDraw));
 
-  DrawEdge(NULL, &(infoPtr->rcDraw), EDGE_SUNKEN, BF_RECT | BF_ADJUST);
+  /* subract the size of the edge drawn by DrawEdge */
+  InflateRect(&infoPtr->rcDraw, -2, -2);
 
   /* set the size of the button that drops the calendar down */
   /* FIXME: account for style that allows button on left side */
diff --git a/reactos/lib/comctl32/tooltips.c b/reactos/lib/comctl32/tooltips.c
index 15bb59bf0da..cd7628861db 100644
--- a/reactos/lib/comctl32/tooltips.c
+++ b/reactos/lib/comctl32/tooltips.c
@@ -2818,7 +2818,7 @@ VOID
 TOOLTIPS_Unregister (void)
 {
     int i;
-    for (i = 0; i < TTI_ERROR+1; i++)
-        DeleteObject(hTooltipIcons[i]);
+    for (i = TTI_INFO; i <= TTI_ERROR; i++)
+        DestroyIcon(hTooltipIcons[i]);
     UnregisterClassW (TOOLTIPS_CLASSW, NULL);
 }