diff --git a/uppsrc/CtrlLib/ColumnList.cpp b/uppsrc/CtrlLib/ColumnList.cpp
index 6ebeaef5e..49ef7bb90 100644
--- a/uppsrc/CtrlLib/ColumnList.cpp
+++ b/uppsrc/CtrlLib/ColumnList.cpp
@@ -651,7 +651,7 @@ int ColumnList::RoundedCy()
 	Rect r = GetRect();
 	Rect rr = r;
 	frame->FrameLayout(r);
-	return r.Height() / cy * cy + rr.Height() - r.Height();
+	return (cy ? r.Height() / cy * cy : 0) + rr.Height() - r.Height();
 }
 
 void ColumnList::FrameLayout(Rect& r)
diff --git a/uppsrc/RichText/EncodeRTF.cpp b/uppsrc/RichText/EncodeRTF.cpp
index c67ce9613..f647d2b9a 100644
--- a/uppsrc/RichText/EncodeRTF.cpp
+++ b/uppsrc/RichText/EncodeRTF.cpp
@@ -398,9 +398,12 @@ void RTFEncoder::PutHeader()
 			Group fnt(this, "f", i);
 			int fn = used_faces[i];
 			dword info = Font::GetFaceInfo(fn);
-			if(info & Font::SYMBOLTYPE)
+#ifdef PLATFORM_WIN32
+			if(fn == Font::SYMBOL)
 				Command("ftech");
-			else if(info & Font::FIXEDPITCH)
+			else
+#endif
+			if(info & Font::FIXEDPITCH)
 				Command("fmodern");
 			else if(fn == Font::ROMAN)
 				Command("froman");