diff --git a/doc/glossary.texi b/doc/glossary.texi
index 98e08c76..ffccbd51 100644
--- a/doc/glossary.texi
+++ b/doc/glossary.texi
@@ -185,7 +185,7 @@ programming than an MSF.
 @item Lead in
 @cindex lead in
 
-The area of a CD where the Table Of Contents (TOC) and CDTEXT are
+The area of a CD where the Table Of Contents (TOC) and CD Text are
 stored.  I think it is supposed to be around 4500 (1 min) or more
 sectors in length.  On a CDR(W) the lead-in length is variable,
 because each manufacturer will have a different starting position
diff --git a/include/cdio/util.h b/include/cdio/util.h
index 28f21507..5cfaf70e 100644
--- a/include/cdio/util.h
+++ b/include/cdio/util.h
@@ -1,5 +1,5 @@
 /*
-    $Id: util.h,v 1.7 2005/02/28 02:05:19 rocky Exp $
+    $Id: util.h,v 1.8 2005/04/27 23:31:47 rocky Exp $
 
     Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -42,12 +42,12 @@
 #undef  CLAMP
 #define CLAMP(x, low, high)  (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
 
-static inline uint16_t
-_cdio_len2blocks (unsigned int i_len, uint16_t i_blocksize)
+static inline uint32_t
+_cdio_len2blocks (uint32_t i_len, uint16_t i_blocksize)
 {
-  uint16_t i_blocks;
+  uint32_t i_blocks;
 
-  i_blocks = i_len / i_blocksize;
+  i_blocks = i_len / (uint32_t) i_blocksize;
   if (i_len % i_blocksize)
     i_blocks++;