diff --git a/uppsrc/CtrlCore/GtkEvent.cpp b/uppsrc/CtrlCore/GtkEvent.cpp
index 5ba8f3edf..9c3cc30af 100644
--- a/uppsrc/CtrlCore/GtkEvent.cpp
+++ b/uppsrc/CtrlCore/GtkEvent.cpp
@@ -73,7 +73,7 @@ Ctrl *Ctrl::GetTopCtrlFromId(int id)
 	int q = FindId(id);
 	if(q >= 0) {
 		Ctrl *p = wins[q].ctrl;
-		if(p && p->top)
+		if(p && p->top)50
 			return p;
 	}
 	return NULL;
diff --git a/uppsrc/TextDiffCtrl/PatchDiff.cpp b/uppsrc/TextDiffCtrl/PatchDiff.cpp
index 0b097548d..813756f50 100644
--- a/uppsrc/TextDiffCtrl/PatchDiff.cpp
+++ b/uppsrc/TextDiffCtrl/PatchDiff.cpp
@@ -128,7 +128,7 @@ bool PatchDiff::Open(const char *patch_path, const Vector<String>& target_dirs)
 int PatchDiff::GetFileIndex() const
 {
 	int ii = files.GetCursor();
-	return ii >= 0 ? files.Get(ii).data : -1;
+	return ii >= 0 ? (int)files.Get(ii).data : -1;
 }
 
 void PatchDiff::File()