diff --git a/example/sample2.c b/example/sample2.c
index b5421406..950198cc 100644
--- a/example/sample2.c
+++ b/example/sample2.c
@@ -1,5 +1,5 @@
 /*
-  $Id: sample2.c,v 1.8 2004/04/25 14:07:23 rocky Exp $
+  $Id: sample2.c,v 1.9 2004/07/13 12:28:18 rocky Exp $
 
   Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
   
@@ -47,7 +47,7 @@ main(int argc, const char *argv[])
     if (default_device) {
       cdio_drive_cap_t i_drive_cap =  cdio_get_drive_cap(cdio);
       printf("The default device for this driver is %s\n", default_device);
-      printf("drive capability in hex: %x\n", i_drive_cap);
+      printf("drive capability in hex: %x\n", (unsigned int) i_drive_cap);
       if (CDIO_DRIVE_CAP_ERROR == i_drive_cap) {
 	printf("Error in getting drive properties\n");
       } else if (CDIO_DRIVE_CAP_UNKNOWN == i_drive_cap) {
diff --git a/lib/MSWindows/aspi32.c b/lib/MSWindows/aspi32.c
index 8c942360..cfd94d6a 100644
--- a/lib/MSWindows/aspi32.c
+++ b/lib/MSWindows/aspi32.c
@@ -1,5 +1,5 @@
 /*
-    $Id: aspi32.c,v 1.18 2004/07/13 04:33:07 rocky Exp $
+    $Id: aspi32.c,v 1.19 2004/07/13 12:28:21 rocky Exp $
 
     Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: aspi32.c,v 1.18 2004/07/13 04:33:07 rocky Exp $";
+static const char _rcsid[] = "$Id: aspi32.c,v 1.19 2004/07/13 12:28:21 rocky Exp $";
 
 #include <cdio/cdio.h>
 #include <cdio/sector.h>
@@ -286,6 +286,8 @@ init_aspi (_img_private_t *env)
   } else if ( 6 == strlen(env->gen.source_name) 
 	      && isalpha(env->gen.source_name[4] )) {
     c_drive = env->gen.source_name[4];
+  } else {
+    c_drive = 'C';
   }
   
   if ( !have_aspi(&hASPI, &lpGetSupport, &lpSendCommand) )
diff --git a/lib/MSWindows/win32_ioctl.c b/lib/MSWindows/win32_ioctl.c
index 60efcf7a..d8b4c46a 100644
--- a/lib/MSWindows/win32_ioctl.c
+++ b/lib/MSWindows/win32_ioctl.c
@@ -1,5 +1,5 @@
 /*
-    $Id: win32_ioctl.c,v 1.9 2004/07/13 03:45:26 rocky Exp $
+    $Id: win32_ioctl.c,v 1.10 2004/07/13 12:28:21 rocky Exp $
 
     Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: win32_ioctl.c,v 1.9 2004/07/13 03:45:26 rocky Exp $";
+static const char _rcsid[] = "$Id: win32_ioctl.c,v 1.10 2004/07/13 12:28:21 rocky Exp $";
 
 #include <cdio/cdio.h>
 #include <cdio/sector.h>
@@ -181,7 +181,7 @@ read_audio_sectors_win32ioctl (_img_private_t *env, void *data, lsn_t lsn,
 		       sizeof(RAW_READ_INFO), data,
 		       CDIO_CD_FRAMESIZE_RAW * nblocks,
 		       &dwBytesReturned, NULL ) == 0 ) {
-    char *psz_msg;
+    char *psz_msg = NULL;
     DWORD dw = GetLastError();
 
     FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, 
@@ -244,7 +244,7 @@ read_raw_sector (const _img_private_t *env, void *buf, lsn_t lsn)
 			  NULL);
 
   if(! success) {
-    char *psz_msg;
+    char *psz_msg = NULL;
     DWORD dw = GetLastError();
 
     FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,