diff --git a/doc/configuration.txt b/doc/configuration.txt
index 5140ff1e8..5a0269e3c 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -1400,7 +1400,7 @@ balance url_param <param> [check_post [<max_wait>]]
                   processing time remains equally distributed. This algorithm
                   is dynamic, which means that server weights may be adjusted
                   on the fly for slow starts for instance. It is limited by
-                  design to 4128 active servers per backend. Note that in some
+                  design to 4095 active servers per backend. Note that in some
                   large farms, when a server becomes up after having been down
                   for a very short time, it may sometimes take a few hundreds
                   requests for it to be re-integrated into the farm and start
diff --git a/include/types/backend.h b/include/types/backend.h
index fd66e407a..1183b3658 100644
--- a/include/types/backend.h
+++ b/include/types/backend.h
@@ -114,8 +114,8 @@
  * weight modulation even with small weights (eg: 1). It should not be too high
  * though because it limits the number of servers in FWRR mode in order to
  * prevent any integer overflow. The max number of servers per backend is
- * limited to about 2^32/255^2/scale ~= 66051/scale. A scale of 16 looks like
- * a good value, as it allows more than 4000 servers per backend while leaving
+ * limited to about (2^32-1)/256^2/scale ~= 65535.9999/scale. A scale of 16
+ * looks like a good value, as it allows 4095 servers per backend while leaving
  * modulation steps of about 6% for servers with the lowest weight (1).
  */
 #define BE_WEIGHT_SCALE 16
diff --git a/include/types/server.h b/include/types/server.h
index b58a06207..e70ad8f9d 100644
--- a/include/types/server.h
+++ b/include/types/server.h
@@ -72,7 +72,7 @@
 
 /* various constants */
 #define SRV_UWGHT_RANGE 256
-#define SRV_UWGHT_MAX   (SRV_UWGHT_RANGE - 1)
+#define SRV_UWGHT_MAX   (SRV_UWGHT_RANGE)
 #define SRV_EWGHT_RANGE (SRV_UWGHT_RANGE * BE_WEIGHT_SCALE)
 #define SRV_EWGHT_MAX   (SRV_UWGHT_MAX   * BE_WEIGHT_SCALE)
 
diff --git a/src/cfgparse.c b/src/cfgparse.c
index b3435ef6f..a85bbedf0 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -4392,9 +4392,9 @@ stats_error_parsing:
 			else if (!strcmp(args[cur_arg], "weight")) {
 				int w;
 				w = atol(args[cur_arg + 1]);
-				if (w < 0 || w > 256) {
-					Alert("parsing [%s:%d] : weight of server %s is not within 0 and 256 (%d).\n",
-					      file, linenum, newsrv->id, w);
+				if (w < 0 || w > SRV_UWGHT_MAX) {
+					Alert("parsing [%s:%d] : weight of server %s is not within 0 and %d (%d).\n",
+					      file, linenum, newsrv->id, SRV_UWGHT_MAX, w);
 					err_code |= ERR_ALERT | ERR_FATAL;
 					goto out;
 				}
diff --git a/src/lb_fwrr.c b/src/lb_fwrr.c
index d92b6eb82..7f5c8a9fb 100644
--- a/src/lb_fwrr.c
+++ b/src/lb_fwrr.c
@@ -343,7 +343,7 @@ static void fwrr_queue_srv(struct server *s)
 		 * lower the scale, the rougher the weights modulation, and the
 		 * higher the scale, the lower the number of servers without
 		 * overflow. With this formula, the result is always positive,
-		 * so we can use eb3é_insert().
+		 * so we can use eb32_insert().
 		 */
 		s->lb_node.key = SRV_UWGHT_RANGE * s->npos +
 			(unsigned)(SRV_EWGHT_MAX + s->rweight - s->eweight) / BE_WEIGHT_SCALE;