diff --git a/src/k_bot.c b/src/k_bot.c
index ca3aaa2c3..968ba8632 100644
--- a/src/k_bot.c
+++ b/src/k_bot.c
@@ -657,7 +657,7 @@ static botprediction_t *K_CreateBotPrediction(player_t *player)
 
 	const INT32 startDist = (DEFAULT_WAYPOINT_RADIUS * 2 * mapobjectscale) / FRACUNIT;
 	const INT32 maxDist = startDist * 4; // This function gets very laggy when it goes far distances, and going too far isn't very helpful anyway.
-	const INT32 distance = min(((speed / FRACUNIT) * futuresight) + startDist, maxDist);
+	const INT32 distance = min(((speed / FRACUNIT) * (INT32)futuresight) + startDist, maxDist);
 
 	// Halves radius when encountering a wall on your way to your destination.
 	fixed_t radreduce = FRACUNIT;
diff --git a/src/m_fixed.h b/src/m_fixed.h
index 9f3bb2910..021f84d89 100644
--- a/src/m_fixed.h
+++ b/src/m_fixed.h
@@ -204,7 +204,7 @@ FUNCMATH FUNCINLINE static ATTRINLINE fixed_t FixedInt(fixed_t a)
 */
 FUNCMATH FUNCINLINE static ATTRINLINE fixed_t FixedDiv(fixed_t a, fixed_t b)
 {
-	if ((abs(a) >> (FRACBITS-2)) >= abs(b))
+	if ((abs(a / (FRACUNIT/4))) >= abs(b))
 		return (a^b) < 0 ? INT32_MIN : INT32_MAX;
 
 	return FixedDiv2(a, b);