diff --git a/uppsrc/CodeEditor/Highlight.cpp b/uppsrc/CodeEditor/Highlight.cpp
index 9a45d3c8a..6df0733f5 100644
--- a/uppsrc/CodeEditor/Highlight.cpp
+++ b/uppsrc/CodeEditor/Highlight.cpp
@@ -328,9 +328,9 @@ void CodeEditor::InitKeywords()
 		};
 		static const char *upp_logs[] = {
 			"LOG", "LOGF", "DUMP", "DUMPC", "DUMPCC", "DUMPCCC", "DUMPM",
-			"LLOG", "LLOGF", "LDUMP", "LDUMPC", "LDUMPCC", "LDUMPCCC",
-			"DLOG", "DLOGF", "DDUMP", "DDUMPC", "DDUMPCC", "DDUMPCCC",
-			"RLOG", "RLOGF", "RDUMP", "RDUMPC", "RDUMPCC", "RDUMPCCC",
+			"LLOG", "LLOGF", "LDUMP", "LDUMPC", "LDUMPCC", "LDUMPCCC", "LDUMPM",
+			"DLOG", "DLOGF", "DDUMP", "DDUMPC", "DDUMPCC", "DDUMPCCC", "DDUMPM",
+			"RLOG", "RLOGF", "RDUMP", "RDUMPC", "RDUMPCC", "RDUMPCCC", "RDUMPM",
 			"LOGBEGIN", "LOGEND", "LOGBLOCK", "LOGHEXDUMP", "LOGSRCPOS", 
 			"RLOGBEGIN", "RLOGEND", "RLOGBLOCK", "RLOGHEXDUMP", "RLOGSRCPOS", "RQUOTE",
 			"RTIMING", "TIMING", "LTIMING",
diff --git a/uppsrc/Core/Diag.h b/uppsrc/Core/Diag.h
index c8cf1acb5..312fa85bd 100644
--- a/uppsrc/Core/Diag.h
+++ b/uppsrc/Core/Diag.h
@@ -124,7 +124,7 @@ inline void UnlockLog() {}
 #define DLOG(x)          LOG(x)
 #define DDUMP(x)         DUMP(x)
 #define DDUMPC(x)        DUMPC(x)
-#define DDUMPM(x)        DDUMPM(x)
+#define DDUMPM(x)        DUMPM(x)
 #define DTIMING(x)       TIMING(x)
 
 #else
@@ -183,6 +183,7 @@ struct DebugLogBlock
 #define RLOGSRCPOS()      UPP::LockLog(), UPP::VppLog() << __FILE__ << '#' << __LINE__ << UPP::EOL
 #define RDUMP(a)          UPP::LockLog(), UPP::VppLog() << #a << " = " << (a) << UPP::EOL, UPP::UnlockLog()
 #define RDUMPC(c)         UPP::LockLog(), UPP::DumpContainer(UPP::VppLog() << #c << ':' << UPP::EOL, (c)), UPP::UnlockLog()
+#define RDUMPM(c)         UPP::LockLog(), UPP::DumpMap(VppLog() << #c << ':' << UPP::EOL, (c)), UPP::UnlockLog()
 
 // Crash support
 
diff --git a/uppsrc/CtrlLib/ToolTip.cpp b/uppsrc/CtrlLib/ToolTip.cpp
index 8910a1307..8fa5a5425 100644
--- a/uppsrc/CtrlLib/ToolTip.cpp
+++ b/uppsrc/CtrlLib/ToolTip.cpp
@@ -18,7 +18,7 @@ void ToolTip::Paint(Draw& w)
 {
 	Size sz = GetSize();
 	w.DrawRect(sz, SColorInfo);
-	DrawSmartText(w, 2, 2, sz.cx - 4, text);
+	DrawSmartText(w, 2, 2, sz.cx - 4, text, StdFont(), SColorInfoText());
 }
 
 void ToolTip::PopUp(Ctrl *owner, Point p, bool effect)