diff --git a/lib/cdda_interface/scan_devices.c b/lib/cdda_interface/scan_devices.c
index ce542ffc..031f7d4d 100644
--- a/lib/cdda_interface/scan_devices.c
+++ b/lib/cdda_interface/scan_devices.c
@@ -1,5 +1,5 @@
 /*
-  $Id: scan_devices.c,v 1.4 2005/01/06 03:38:58 rocky Exp $
+  $Id: scan_devices.c,v 1.5 2005/01/06 16:37:30 rocky Exp $
 
   Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
   Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -122,23 +122,9 @@ cdda_find_a_cdrom(int messagedest, char **messages){
 cdrom_drive_t *
 cdda_identify(const char *device, int messagedest,char **messages)
 {
-  struct stat st;
   cdrom_drive_t *d=NULL;
   idmessage(messagedest,messages,"Checking %s for cdrom...",device);
 
-  if(stat(device,&st)){
-    idperror(messagedest,messages,"\tCould not stat %s",device);
-    return(NULL);
-  }
-    
-#ifndef CDDA_TEST
-  if (!S_ISCHR(st.st_mode) &&
-      !S_ISBLK(st.st_mode)){
-    idmessage(messagedest,messages,"\t%s is not a block or character device",device);
-    return(NULL);
-  }
-#endif
-
   d=cdda_identify_cooked(device,messagedest,messages);
 
 #ifdef CDDA_TEST
@@ -174,7 +160,7 @@ cdda_identify_cooked(const char *dev, int messagedest, char **messages)
   CdIo_t *p_cdio = NULL;
 
   device = test_resolve_symlink(dev,messagedest,messages);
-  if ( !device ) return NULL;
+  if ( !device ) device = strdup(dev);
 
   p_cdio = cdio_open(device, DRIVER_UNKNOWN);
   
diff --git a/lib/driver/MSWindows/win32_ioctl.c b/lib/driver/MSWindows/win32_ioctl.c
index 9b46ff3f..ca68cc8c 100644
--- a/lib/driver/MSWindows/win32_ioctl.c
+++ b/lib/driver/MSWindows/win32_ioctl.c
@@ -1,5 +1,5 @@
 /*
-    $Id: win32_ioctl.c,v 1.3 2005/01/01 15:08:48 rocky Exp $
+    $Id: win32_ioctl.c,v 1.4 2005/01/06 16:37:31 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.3 2005/01/01 15:08:48 rocky Exp $";
+static const char _rcsid[] = "$Id: win32_ioctl.c,v 1.4 2005/01/06 16:37:31 rocky Exp $";
 
 #ifdef HAVE_WIN32_CDROM
 
@@ -380,8 +380,8 @@ read_audio_sectors_win32ioctl (_img_private_t *env, void *data, lsn_t lsn,
     char *psz_msg = NULL;
     long int i_err = GetLastError();
     FORMAT_ERROR(i_err, psz_msg);
-    cdio_info("Error reading audio-mode %lu\n%s)", 
-	      (long unsigned int) lsn, psz_msg);
+    cdio_info("Error reading audio-mode lsn %lu\n%s (%d))", 
+	      (long unsigned int) lsn, psz_msg, i_err);
     LocalFree(psz_msg);
     return 1;
   }