diff --git a/controls/menu.c b/controls/menu.c
index 14af490..4a65fd2 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -3830,7 +3830,7 @@
         if (str[0] == '#') name = (SEGPTR)atoi( str + 1 );
     }
     else
-        TRACE(resource,"(%04x,%04x)\n",instance,LOWORD(name));
+        TRACE(menu,"(%04x,%04x)\n",instance,LOWORD(name));
 
     if (!name) return 0;
     
diff --git a/controls/uitools.c b/controls/uitools.c
index 84067a6..c83a805 100644
--- a/controls/uitools.c
+++ b/controls/uitools.c
@@ -927,7 +927,7 @@
         return UITOOLS95_DFC_ButtonRadio(hdc, rc, uState);
 
     default:
-        WARN(uitools, "Invalid button state=0x%04x\n", uState);
+        WARN(graphics, "Invalid button state=0x%04x\n", uState);
     }
 
     return FALSE;
@@ -1063,7 +1063,7 @@
         break;
 
     default:
-        WARN(uitools, "Invalid caption; flags=0x%04x\n", uFlags);
+        WARN(graphics, "Invalid caption; flags=0x%04x\n", uFlags);
         return FALSE;
     }
 
@@ -1233,7 +1233,7 @@
         return TRUE;
 
     default:
-        WARN(uitools, "Invalid scroll; flags=0x%04x\n", uFlags);
+        WARN(graphics, "Invalid scroll; flags=0x%04x\n", uFlags);
         return FALSE;
     }
 
@@ -1335,7 +1335,7 @@
         break;
 
     default:
-        WARN(uitools, "Invalid menu; flags=0x%04x\n", uFlags);
+        WARN(graphics, "Invalid menu; flags=0x%04x\n", uFlags);
         retval = FALSE;
         break;
     }
@@ -1383,7 +1383,7 @@
     case DFC_SCROLL:
       return UITOOLS95_DrawFrameScroll(hdc, rc, uState);
     default:
-      WARN(uitools, "(%x,%p,%d,%x), bad type!\n",
+      WARN(graphics, "(%x,%p,%d,%x), bad type!\n",
 	   hdc,rc,uType,uState );
     }
     return FALSE;