diff --git a/include/cdio/cdio.h b/include/cdio/cdio.h
index 08466236..b461431f 100644
--- a/include/cdio/cdio.h
+++ b/include/cdio/cdio.h
@@ -1,5 +1,5 @@
 /* -*- c -*-
-    $Id: cdio.h,v 1.42 2004/04/25 00:46:34 rocky Exp $
+    $Id: cdio.h,v 1.43 2004/04/25 16:38:06 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -207,7 +207,7 @@ extern "C" {
   track_t cdio_get_first_track_num(const CdIo *obj);
   
   /*!
-    Return a string containing the default CD device if none is specified.
+    Return the number of tracks on the CD.
   */
   track_t cdio_get_num_tracks (const CdIo *obj);
   
diff --git a/lib/_cdio_freebsd.c b/lib/_cdio_freebsd.c
index 45a507ac..be45b0fb 100644
--- a/lib/_cdio_freebsd.c
+++ b/lib/_cdio_freebsd.c
@@ -1,5 +1,5 @@
 /*
-    $Id: _cdio_freebsd.c,v 1.20 2004/04/25 15:41:26 rocky Exp $
+    $Id: _cdio_freebsd.c,v 1.21 2004/04/25 16:38:06 rocky Exp $
 
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: _cdio_freebsd.c,v 1.20 2004/04/25 15:41:26 rocky Exp $";
+static const char _rcsid[] = "$Id: _cdio_freebsd.c,v 1.21 2004/04/25 16:38:06 rocky Exp $";
 
 #include <cdio/sector.h>
 #include <cdio/util.h>
@@ -377,9 +377,9 @@ _get_first_track_num_freebsd(void *env)
 
  */
 static char *
-_get_mcn_freebsd (void *env) {
+_get_mcn_freebsd (const void *env) {
 
-  _img_private_t *_obj = env;
+  const _img_private_t *_obj = env;
   struct ioc_read_subchannel subchannel;
   struct cd_sub_channel_info subchannel_info;
 
diff --git a/lib/_cdio_osx.c b/lib/_cdio_osx.c
index 1fb6ab32..81fd6675 100644
--- a/lib/_cdio_osx.c
+++ b/lib/_cdio_osx.c
@@ -1,5 +1,5 @@
 /*
-    $Id: _cdio_osx.c,v 1.16 2004/04/25 15:41:26 rocky Exp $
+    $Id: _cdio_osx.c,v 1.17 2004/04/25 16:38:06 rocky Exp $
 
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> 
     from vcdimager code: 
@@ -33,7 +33,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.16 2004/04/25 15:41:26 rocky Exp $";
+static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.17 2004/04/25 16:38:06 rocky Exp $";
 
 #include <cdio/sector.h>
 #include <cdio/util.h>
@@ -579,8 +579,8 @@ _get_first_track_num_osx(void *env)
   Return the media catalog number MCN.
  */
 static char *
-_get_mcn_osx (void *env) {
-  _img_private_t *_obj = env;
+_get_mcn_osx (const void *env) {
+  const _img_private_t *_obj = env;
   dk_cd_read_mcn_t cd_read;
 
   memset( &cd_read, 0, sizeof(cd_read) );