diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -557,7 +557,7 @@ static void GameDifficultyWndProc(Window
 				value = ((GDType*)&_opt_mod_temp.diff)[i];
 
 				DrawArrowButtons(5, y, 3,
-						(diffic_d->clicked_button == i) ? 1 << diffic_d->clicked_increase : 0,
+						(diffic_d->clicked_button == i) ? 1 + !!diffic_d->clicked_increase : 0,
 						!(HasBit(disabled, i) || gsd->min == value),
 						!(HasBit(disabled, i) || gsd->max == value));
 
diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp
--- a/src/tree_cmd.cpp
+++ b/src/tree_cmd.cpp
@@ -498,7 +498,7 @@ static void DrawTile_Trees(TileInfo *ti)
 		uint mi = 0;
 
 		for (uint i = 1; i < trees; i++) {
-			if (te[i].x + te[i].y < min) {
+			if ((uint)(te[i].x + te[i].y) < min) {
 				min = te[i].x + te[i].y;
 				mi = i;
 			}