diff --git a/src/data/field/choice.cpp b/src/data/field/choice.cpp
index 7f86c900..9ae635d0 100644
--- a/src/data/field/choice.cpp
+++ b/src/data/field/choice.cpp
@@ -208,7 +208,7 @@ IMPLEMENT_REFLECTION(ChoiceStyle) {
 	REFLECT(combine);
 	REFLECT(alignment);
 	REFLECT(colors_card_list);
-//	REFLECT(font);
+	REFLECT(font);
 	REFLECT(choice_images);
 //	if (tag.reading() && choice_colors.empty())
 	REFLECT(choice_colors);
diff --git a/src/data/field/choice.hpp b/src/data/field/choice.hpp
index 8c286582..27515588 100644
--- a/src/data/field/choice.hpp
+++ b/src/data/field/choice.hpp
@@ -12,6 +12,7 @@
 #include <util/prec.hpp>
 #include <util/defaultable.hpp>
 #include <data/field.hpp>
+#include <data/font.hpp>
 #include <gfx/gfx.hpp> // for ImageCombine
 #include <script/scriptable.hpp>
 #include <script/image.hpp>
@@ -117,7 +118,7 @@ class ChoiceStyle : public Style {
 	
 	ChoicePopupStyle			popup_style;	///< Style of popups/menus
 	ChoiceRenderStyle			render_style;	///< Style of rendering
-//	FontInfo					font;			///< Font for drawing text (when RENDER_TEXT)
+	Font						font;			///< Font for drawing text (when RENDER_TEXT)
 	map<String,ScriptableImage>	choice_images;	///< Images for the various choices (when RENDER_IMAGE)
 	map<String,Color>			choice_colors;	///< Colors for the various choices (when color_cardlist)
 	bool						colors_card_list;///< Does this field determine colors of the rows in the card list?
diff --git a/src/gui/control/package_list.cpp b/src/gui/control/package_list.cpp
index 25525d56..8d99781a 100644
--- a/src/gui/control/package_list.cpp
+++ b/src/gui/control/package_list.cpp
@@ -82,12 +82,14 @@ void PackageList::clear() {
 	update();
 }
 
-void PackageList::select(const String& name) {
+void PackageList::select(const String& name, bool send_event) {
 	for (vector<PackageData>::const_iterator it = packages.begin() ; it != packages.end() ; ++it) {
 		if (it->package->name() == name) {
 			selection = it - packages.begin();
 			update();
-			sendEvent(EVENT_GALLERY_SELECT);
+			if (send_event) {
+				sendEvent(EVENT_GALLERY_SELECT);
+			}
 			return;
 		}
 	}
diff --git a/src/gui/control/package_list.hpp b/src/gui/control/package_list.hpp
index 2abf597e..9e91c9ec 100644
--- a/src/gui/control/package_list.hpp
+++ b/src/gui/control/package_list.hpp
@@ -44,7 +44,7 @@ class PackageList : public GalleryList {
 	}
 	
 	/// Select the package with the given name, if it is not found, selects nothing
-	void select(const String& name);
+	void select(const String& name, bool send_event = true);
 	
   protected:
 	/// Return how many items there are in the list
diff --git a/src/gui/value/text.cpp b/src/gui/value/text.cpp
index 39be3c26..d5c4cff4 100644
--- a/src/gui/value/text.cpp
+++ b/src/gui/value/text.cpp
@@ -402,8 +402,8 @@ void TextValueEditor::showCaret() {
 	cursor = rot.tr(cursor);
 	// set size
 	wxSize size = cursor.size();
-	size.SetWidth (max(1, size.GetWidth()));
-	size.SetHeight(max(1, size.GetHeight()));
+	if (size.GetWidth()  == 0) size.SetWidth (1);
+	if (size.GetHeight() == 0) size.SetHeight(1);
 	// resize, move, show
 	if (size != caret->GetSize()) {
 		caret->SetSize(size);
diff --git a/src/util/rotation.cpp b/src/util/rotation.cpp
index 00b2c152..291d0a96 100644
--- a/src/util/rotation.cpp
+++ b/src/util/rotation.cpp
@@ -80,6 +80,14 @@ RealPoint Rotation::trInv(const RealPoint& p) const {
 	}
 }
 
+RealSize Rotation::trInvNoNeg(const RealSize& s) const {
+	if (sideways()) {
+		return RealSize(s.height, s.width) / zoom;
+	} else {
+		return RealSize(s.width, s.height) / zoom;
+	}
+}
+
 // ----------------------------------------------------------------------------- : Rotater
 
 Rotater::Rotater(Rotation& rot, const Rotation& by)
diff --git a/src/util/rotation.hpp b/src/util/rotation.hpp
index 27a30409..feb93e69 100644
--- a/src/util/rotation.hpp
+++ b/src/util/rotation.hpp
@@ -31,7 +31,7 @@ class Rotation {
 	/// Change the angle
 	void setAngle(int a);
 	/// The internal size
-	inline RealSize getInternalSize() const { return trInv(size); }
+	inline RealSize getInternalSize() const { return trInvNoNeg(size); }
 	/// The intarnal rectangle (origin at (0,0))
 	inline RealRect getInternalRect() const { return RealRect(RealPoint(0,0), getInternalSize()); }
 	/// The external rectangle (as passed to the constructor) == trNoNeg(getInternalRect())
@@ -64,6 +64,8 @@ class Rotation {
 	RealPoint trInv(const RealPoint& p) const;
 	/// Translate a size back to internal coordinates
 	RealSize  trInv(const RealSize&  s) const;
+	/// Translate a size back to internal coordinates, that are not negative
+	RealSize  trInvNoNeg(const RealSize&  s) const;
 	
   protected:
 	int angle;				///< The angle of rotation in degrees (counterclockwise)