diff --git a/uppsrc/CtrlCore/CocoClip.mm b/uppsrc/CtrlCore/CocoClip.mm
index 4678d98bb..2d2fabefd 100644
--- a/uppsrc/CtrlCore/CocoClip.mm
+++ b/uppsrc/CtrlCore/CocoClip.mm
@@ -128,16 +128,18 @@ void Ctrl::RegisterCocoaDropFormats()
 	[nsview registerForDraggedTypes:[PasteboardTypes(drop_formats.GetKeys()) allObjects]];
 }
 
-void RegisterDropFormats(const char *formats)
+void Ctrl::RegisterDropFormats(const char *formats)
 {
+	int n = drop_formats.GetCount();
 	for(String fmt : Split(formats, ';'))
 		drop_formats.FindAdd(fmt);
-	for(Ctrl *q : Ctrl::GetTopCtrls())
-		q->RegisterCocoaDropFormats();
+	if(drop_formats.GetCount() != n)
+		for(Ctrl *q : Ctrl::GetTopCtrls())
+			q->RegisterCocoaDropFormats();
 }
 
 INITBLOCK {
-	RegisterDropFormats("text;png;image;rtf;files;url");
+	Ctrl::RegisterDropFormats("text;png;image;rtf;files;url");
 }
 
 void AppendClipboard(const char *format, const Value& value, String (*render)(const Value& data))
@@ -419,8 +421,10 @@ int Ctrl::DoDragAndDrop(const char *fmts, const Image& sample, dword actions,
 
 	ClearClipboard(true);
 	ClipboardOwner(true)->source = this;
-	for(int i = 0; i < data.GetCount(); i++)
+	for(int i = 0; i < data.GetCount(); i++) {
+		RegisterDropFormats(data.GetKey(i));
 		AppendClipboard(true, data.GetKey(i), data[i].data, data[i].render);
+	}
 	for(String fmt : Split(fmts, ';')) // GetDropData formats
 		AppendClipboard(true, fmt, String(), NULL);
 
diff --git a/uppsrc/ide/Debuggers/GdbCmd.cpp b/uppsrc/ide/Debuggers/GdbCmd.cpp
index e6d52f426..301ce6bd7 100644
--- a/uppsrc/ide/Debuggers/GdbCmd.cpp
+++ b/uppsrc/ide/Debuggers/GdbCmd.cpp
@@ -106,9 +106,7 @@ bool Gdb::Result(String& result, const String& s)
 String Gdb::Cmd(const char *command, bool start)
 {
 	if(!dbg || !dbg->IsRunning() || IdeIsDebugLock()) return Null;
-#ifdef _DEBUG
 	TimeStop ts;
-#endif
 	Lock();
 	if(command) {
 		LLOG("========= Cmd: " << command);
@@ -125,7 +123,6 @@ String Gdb::Cmd(const char *command, bool start)
 			LLOG("Running: " << dbg->IsRunning());
 			break;
 		}
-		if(s.GetCount()) DDUMP(s);
 		if(!s.IsEmpty() && Result(result, s)) {
 			LLOG(result);
 			PutVerbose(result);