diff --git a/uppsrc/Core/App.cpp b/uppsrc/Core/App.cpp
index 34ae587ec..a05d3cb68 100644
--- a/uppsrc/Core/App.cpp
+++ b/uppsrc/Core/App.cpp
@@ -213,7 +213,6 @@ const Vector<String>& CommandLine()
 {
 	static Vector<String> cmd;
 	ONCELOCK {
-		byte cs = GetDefaultCharset();
 		auto& src = coreCmdLine__();
 		for(int i = 0; i < src.GetCount(); i++)
 			cmd.Add(src[i].ToString());
diff --git a/uppsrc/CtrlCore/CocoApp.mm b/uppsrc/CtrlCore/CocoApp.mm
index 2c2a090e2..c60004f65 100644
--- a/uppsrc/CtrlCore/CocoApp.mm
+++ b/uppsrc/CtrlCore/CocoApp.mm
@@ -76,6 +76,8 @@ void Upp::CocoInit(int argc, const char **argv, const char **envptr)
 	      SyncPopupFocus([e window]);
 	      return e;
     }];
+    
+    extern const char *Upp::sClipFmtsRTF; Upp::sClipFmtsRTF = "rtf";
 }
 
 void Upp::CocoExit()
diff --git a/uppsrc/CtrlCore/CocoClip.mm b/uppsrc/CtrlCore/CocoClip.mm
index a6e6ac425..bbd464f79 100644
--- a/uppsrc/CtrlCore/CocoClip.mm
+++ b/uppsrc/CtrlCore/CocoClip.mm
@@ -273,11 +273,6 @@ Vector<String> GetFiles(PasteClip& clip)
 	return f;
 }
 
-const char *ClipFmtsRTF()
-{
-	return "rtf";
-}
-
 };
 
 #endif
diff --git a/uppsrc/CtrlCore/CtrlClip.cpp b/uppsrc/CtrlCore/CtrlClip.cpp
index 887d46b13..7d26d7f3c 100644
--- a/uppsrc/CtrlCore/CtrlClip.cpp
+++ b/uppsrc/CtrlCore/CtrlClip.cpp
@@ -289,4 +289,11 @@ INITBLOCK {
 	InitRichImage(GetImageClip, AcceptImage, GetImage, ClipFmtsImage);
 }
 
+const char *sClipFmtsRTF = "Rich Text Format;text/rtf;application/rtf";
+
+const char *ClipFmtsRTF()
+{
+	return sClipFmtsRTF;
+}
+
 }
diff --git a/uppsrc/CtrlCore/GtkClip.cpp b/uppsrc/CtrlCore/GtkClip.cpp
index 03a1a5cc1..bce4744b4 100644
--- a/uppsrc/CtrlCore/GtkClip.cpp
+++ b/uppsrc/CtrlCore/GtkClip.cpp
@@ -412,11 +412,6 @@ void Ctrl::SetSelectionSource(const char *fmts)
 		gselection().Put(s[i], ClipData(s[i], RenderPrimarySelection));
 }
 
-const char *ClipFmtsRTF()
-{
-	return "Rich Text Format;text/rtf;application/rtf";
-}
-
 }
 
 #endif
diff --git a/uppsrc/CtrlCore/Win32Clip.cpp b/uppsrc/CtrlCore/Win32Clip.cpp
index 2b4db059f..b28c12715 100644
--- a/uppsrc/CtrlCore/Win32Clip.cpp
+++ b/uppsrc/CtrlCore/Win32Clip.cpp
@@ -537,12 +537,6 @@ void PasteClip::GuiPlatformConstruct()
 	dt = NULL;
 }
 
-const char *ClipFmtsRTF()
-{
-	return "Rich Text Format;text/rtf;application/rtf";
-}
-
-
 }
 
 #endif
diff --git a/uppsrc/CtrlCore/X11Clip.cpp b/uppsrc/CtrlCore/X11Clip.cpp
index 0b066583d..e4ff50983 100644
--- a/uppsrc/CtrlCore/X11Clip.cpp
+++ b/uppsrc/CtrlCore/X11Clip.cpp
@@ -403,11 +403,6 @@ void PasteClip::GuiPlatformConstruct()
 	type = 0;
 }
 
-const char *ClipFmtsRTF()
-{
-	return "Rich Text Format;text/rtf;application/rtf";
-}
-
 }
 
 #endif
diff --git a/uppsrc/Turtle/Event.cpp b/uppsrc/Turtle/Event.cpp
index 1cd74ee85..728f443cb 100644
--- a/uppsrc/Turtle/Event.cpp
+++ b/uppsrc/Turtle/Event.cpp
@@ -304,14 +304,12 @@ bool Ctrl::ProcessEvent(const String& event)
 		}
 		if(p.Id("M")) {
 			Point pt = ReadPoint(p);
-			int64 tm = p.ReadInt64();
 			DoMouseFB(MOUSEMOVE, pt, 0, p);
 		}
 		else
 		if(p.Id("W")) {
 			double w = p.ReadDouble();
 			Point pt = ReadPoint(p);
-			int64 tm = p.ReadInt64();
 			DoMouseFB(MOUSEWHEEL, pt, w < 0 ? 120 : -120, p);
 		}
 		else
diff --git a/uppsrc/Turtle/Top.cpp b/uppsrc/Turtle/Top.cpp
index c90682ca5..295cf8399 100644
--- a/uppsrc/Turtle/Top.cpp
+++ b/uppsrc/Turtle/Top.cpp
@@ -71,12 +71,13 @@ void TopWindow::Open(Ctrl *owner)
 	if(r.IsEmpty())
 		SetRect(GetDefaultWindowRect());
 	else
-	if(r.left == 0 && r.top == 0)
+	if(r.left == 0 && r.top == 0) {
 		if(owner && center == 1)
 			SetRect(owner->GetRect().CenterRect(r.GetSize()));
 		else
 		if(center)
 			SetRect(GetWorkArea().CenterRect(r.GetSize()));
+	}
 	frame->SetClient(GetRect());
 	frame->window = this;
 	frame->PopUp(owner, false, true);