diff --git a/example/audio.c b/example/audio.c
index 08ed1a0a..1c91ea2b 100644
--- a/example/audio.c
+++ b/example/audio.c
@@ -1,5 +1,5 @@
 /*
-    $Id: audio.c,v 1.5 2005/03/19 16:17:13 rocky Exp $
+    $Id: audio.c,v 1.6 2005/04/11 01:37:38 rocky Exp $
 
     Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
 
@@ -64,7 +64,7 @@
 
 static bool play_track(track_t t1, track_t t2);
 
-CdIo_t             *p_cdio;               /* libcdio handle */
+CdIo_t             *p_cdio = NULL;            /* libcdio handle */
 driver_id_t        driver_id = DRIVER_DEVICE;
 
 /* cdrom data */
@@ -135,7 +135,7 @@ cd_eject(void)
     b_ok = DRIVER_OP_SUCCESS == cdio_eject_media(&p_cdio);
     if (!b_ok)
       xperror("eject");
-    b_cd = 0;
+    b_cd = false;
     p_cdio = NULL;
   }
   return b_ok;
@@ -300,6 +300,7 @@ usage(char *prog)
 }
 
 typedef enum {
+  NO_OP=0,
   PLAY_CD=1,
   PLAY_TRACK=2,
   STOP_PLAYING=3,
@@ -316,7 +317,7 @@ main(int argc, char *argv[])
   char *h;
   int  i_rc = 0;
   int  i_volume_level;
-  cd_operation_t todo; /* operation to do in non-interactive mode */
+  cd_operation_t todo = NO_OP; /* operation to do in non-interactive mode */
   
   psz_program = strrchr(argv[0],'/');
   psz_program = psz_program ? psz_program+1 : argv[0];
@@ -432,6 +433,8 @@ main(int argc, char *argv[])
       }
       if (b_cd)
 	switch (todo) {
+	case NO_OP:
+	  break;
 	case STOP_PLAYING:
 	  i_rc = cd_stop(p_cdio) ? 0 : 1;
 	  break;
diff --git a/example/drives.c b/example/drives.c
index a8e16a9c..15bd7594 100644
--- a/example/drives.c
+++ b/example/drives.c
@@ -1,5 +1,5 @@
 /*
-  $Id: drives.c,v 1.1 2004/10/10 00:21:08 rocky Exp $
+  $Id: drives.c,v 1.2 2005/04/11 01:37:38 rocky Exp $
 
   Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
   
@@ -63,7 +63,6 @@ main(int argc, const char *argv[])
     }
 
   cdio_free_device_list(ppsz_cd_drives);
-  free(ppsz_cd_drives);
   ppsz_cd_drives = NULL;
   
   printf("-----\n");
@@ -78,7 +77,6 @@ main(int argc, const char *argv[])
     
   }
   cdio_free_device_list(ppsz_cd_drives);
-  free(ppsz_cd_drives);
 
   printf("-----\n");
   printf("CD-DA drives...\n");
@@ -92,7 +90,6 @@ main(int argc, const char *argv[])
     }
   }
   cdio_free_device_list(ppsz_cd_drives);
-  free(ppsz_cd_drives);
     
   printf("-----\n");
   ppsz_cd_drives = NULL;
@@ -108,8 +105,6 @@ main(int argc, const char *argv[])
   }
 
   cdio_free_device_list(ppsz_cd_drives);
-  free(ppsz_cd_drives);
-  
   return 0;
   
 }
diff --git a/example/paranoia.c b/example/paranoia.c
index 9f02353f..802d98c7 100644
--- a/example/paranoia.c
+++ b/example/paranoia.c
@@ -52,7 +52,6 @@ main(int argc, const char *argv[])
 
   /* Don't need a list of CD's with CD-DA's any more. */
   cdio_free_device_list(ppsz_cd_drives);
-  free(ppsz_cd_drives);
 
   /* We'll set for verbose paranoia messages. */
   cdda_verbose_set(d, CDDA_MESSAGE_PRINTIT, CDDA_MESSAGE_PRINTIT);
diff --git a/example/paranoia2.c b/example/paranoia2.c
index 2b278af2..74a8a5c2 100644
--- a/example/paranoia2.c
+++ b/example/paranoia2.c
@@ -57,7 +57,6 @@ main(int argc, const char *argv[])
 
   /* Don't need a list of CD's with CD-DA's any more. */
   cdio_free_device_list(ppsz_cd_drives);
-  free(ppsz_cd_drives);
 
   /* We'll set for verbose paranoia messages. */
   cdio_cddap_verbose_set(d, CDDA_MESSAGE_PRINTIT, CDDA_MESSAGE_PRINTIT);
diff --git a/src/cd-drive.c b/src/cd-drive.c
index 27c4498c..4b7eeaeb 100644
--- a/src/cd-drive.c
+++ b/src/cd-drive.c
@@ -1,5 +1,5 @@
 /*
-  $Id: cd-drive.c,v 1.18 2005/03/18 12:56:00 rocky Exp $
+  $Id: cd-drive.c,v 1.19 2005/04/11 01:37:38 rocky Exp $
 
   Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
   
@@ -247,7 +247,6 @@ main(int argc, const char *argv[])
       }
     
     cdio_free_device_list(ppsz_cdrives);
-    free(ppsz_cdrives);
     ppsz_cdrives = NULL;
   } else {
     /* Print CD-drive info for given source */
diff --git a/src/cdda-player.c b/src/cdda-player.c
index a4c8caee..8b2b59ef 100644
--- a/src/cdda-player.c
+++ b/src/cdda-player.c
@@ -1,5 +1,5 @@
 /*
-    $Id: cdda-player.c,v 1.31 2005/04/10 14:52:52 rocky Exp $
+    $Id: cdda-player.c,v 1.32 2005/04/11 01:37:39 rocky Exp $
 
     Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
 
@@ -328,7 +328,7 @@ cd_eject(void)
     b_ok = DRIVER_OP_SUCCESS == cdio_eject_media(&p_cdio);
     if (!b_ok)
       xperror("eject");
-    b_cd = 0;
+    b_cd = false;
     cdio_destroy (p_cdio);
     p_cdio = NULL;
   }