diff --git a/src/bridge_gui.cpp b/src/bridge_gui.cpp
index 7d1c09df4d..a2d49ae2b7 100644
--- a/src/bridge_gui.cpp
+++ b/src/bridge_gui.cpp
@@ -65,7 +65,7 @@ private:
 
 	/* Constants for sorting the bridges */
 	static const StringID sorter_names[];
-	static const GUIBridgeList::SortFunction *const sorter_funcs[];
+	static GUIBridgeList::SortFunction *const sorter_funcs[];
 
 	/* Internal variables */
 	TileIndex start_tile;
diff --git a/src/core/bitmath_func.hpp b/src/core/bitmath_func.hpp
index 775ae83386..dd93b11d92 100644
--- a/src/core/bitmath_func.hpp
+++ b/src/core/bitmath_func.hpp
@@ -97,7 +97,7 @@ template<typename T> static inline bool HasBit(const T x, const uint8 y)
  * @param y The second value
  * @return True if at least one bit is set in both values, false else.
  */
-#define HASBITS(x, y) ((x) & (y))
+#define HASBITS(x, y) (((x) & (y)) != 0)
 
 /**
  * Set a bit in a variable.