diff --git a/src/main_gui.cpp b/src/main_gui.cpp
index 82faefb590..f1d8d447d9 100644
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -1677,12 +1677,12 @@ static void MainToolbarWndProc(Window *w, WindowEvent *e)
 	} break;
 
 	case WE_MOUSELOOP:
-		if (w->IsWidgetLowered(0) != (bool)_pause_game) {
+		if (w->IsWidgetLowered(0) != !!_pause_game) {
 			w->ToggleWidgetLoweredState(0);
 			w->InvalidateWidget(0);
 		}
 
-		if (w->IsWidgetLowered(1) != (bool)_fast_forward) {
+		if (w->IsWidgetLowered(1) != !!_fast_forward) {
 			w->ToggleWidgetLoweredState(1);
 			w->InvalidateWidget(1);
 		}
@@ -1986,12 +1986,12 @@ static void ScenEditToolbarWndProc(Window *w, WindowEvent *e)
 	} break;
 
 	case WE_MOUSELOOP:
-		if (w->IsWidgetLowered(0) != (bool)_pause_game) {
+		if (w->IsWidgetLowered(0) != !!_pause_game) {
 			w->ToggleWidgetLoweredState(0);
 			SetWindowDirty(w);
 		}
 
-		if (w->IsWidgetLowered(1) != (bool)_fast_forward) {
+		if (w->IsWidgetLowered(1) != !!_fast_forward) {
 			w->ToggleWidgetLoweredState(1);
 			SetWindowDirty(w);
 		}
diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp
index 6e05d4f514..fbd4934a71 100644
--- a/src/newgrf_gui.cpp
+++ b/src/newgrf_gui.cpp
@@ -131,7 +131,7 @@ static void NewGRFAddDlgWndProc(Window *w, WindowEvent *e)
 		case WE_PAINT: {
 			const GRFConfig *c;
 			const Widget *wl = &w->widget[ANGRFW_GRF_LIST];
-			uint n = 0;
+			int n = 0;
 
 			/* Count the number of GRFs */
 			for (c = _all_grfs; c != NULL; c = c->next) n++;