diff --git a/tune/common.c b/tune/common.c
index 654fa437..89adcd20 100644
--- a/tune/common.c
+++ b/tune/common.c
@@ -901,7 +901,7 @@ speed_mpn_tdiv_q2 (struct speed_params *s)
 double
 speed_mpn_dc_bdiv_qr_n (struct speed_params *s)
 {
-  SPEED_ROUTINE_MPN_DC_BDIV_N_TSIZE (mpn_dc_bdiv_qr_n, DC_BDIV_Q_N_ITCH(s->size));
+  SPEED_ROUTINE_MPN_DC_BDIV_N_TSIZE (mpn_dc_bdiv_qr_n, DC_BDIV_QR_N_ITCH(2*s->size));
 }
 double
 speed_mpn_dc_bdiv_q (struct speed_params *s)
diff --git a/tune/speed.h b/tune/speed.h
index 57c00fdf..20527a40 100644
--- a/tune/speed.h
+++ b/tune/speed.h
@@ -1745,14 +1745,14 @@ int speed_routine_count_zeros_setup _PROTO ((struct speed_params *s,
     mp_limb_t inv;                                             \
     double    t;							\
     TMP_DECL;								\
-									\
+	                                      \
     SPEED_RESTRICT_COND (s->size >= 2);					\
 									\
     TMP_MARK;								\
     SPEED_TMP_ALLOC_LIMBS (a, 4*s->size, s->align_xp);			\
     SPEED_TMP_ALLOC_LIMBS (d, 2*s->size,   s->align_yp);			\
     SPEED_TMP_ALLOC_LIMBS (q, 2*s->size, s->align_wp);			\
-    SPEED_TMP_ALLOC_LIMBS (tmp, 2*tsize,   s->align_wp2);			\
+    SPEED_TMP_ALLOC_LIMBS (tmp, tsize,   s->align_wp2);			\
     								\
     MPN_COPY (a, s->xp, s->size);					\
     MPN_COPY (a+s->size, s->xp, s->size);				\
@@ -1782,7 +1782,6 @@ int speed_routine_count_zeros_setup _PROTO ((struct speed_params *s,
       function(q, a, d, 2*s->size, inv, tmp);								\
     } while (--i != 0);							\
     t = speed_endtime ();						\
-									\
     TMP_FREE;								\
     return t;								\
   }