diff --git a/lib/driver/MSWindows/win32.c b/lib/driver/MSWindows/win32.c
index 603a4c31..7aea24a2 100644
--- a/lib/driver/MSWindows/win32.c
+++ b/lib/driver/MSWindows/win32.c
@@ -863,17 +863,18 @@ cdio_get_default_device_win32(void)
 }
 
 /*!  
-  Return true if source_name could be a device containing a CD-ROM.
+  Return true if source_name could be a device containing a CD-ROM and
+  we are on a MS Windows platform.
 */
 bool
 cdio_is_device_win32(const char *source_name)
 {
+#ifdef HAVE_WIN32_CDROM
   unsigned int len;
 
   if (NULL == source_name) return false;
   len = strlen(source_name);
 
-#ifdef HAVE_WIN32_CDROM
   if ((len == 2) && isalpha(source_name[0]) 
 	    && (source_name[len-1] == ':'))
     return true;
diff --git a/lib/driver/solaris.c b/lib/driver/solaris.c
index e006a56d..05de900a 100644
--- a/lib/driver/solaris.c
+++ b/lib/driver/solaris.c
@@ -441,16 +441,12 @@ static int
 _read_audio_sectors_solaris (void *p_user_data, void *data, lsn_t i_lsn, 
                              unsigned int i_blocks)
 {
-  struct cdrom_msf solaris_msf;
   msf_t _msf;
   struct cdrom_cdda cdda;
 
   _img_private_t *p_env = p_user_data;
 
   cdio_lba_to_msf (cdio_lsn_to_lba(i_lsn), &_msf);
-  solaris_msf.cdmsf_min0   = cdio_from_bcd8(_msf.m);
-  solaris_msf.cdmsf_sec0   = cdio_from_bcd8(_msf.s);
-  solaris_msf.cdmsf_frame0 = cdio_from_bcd8(_msf.f);
   
   if (p_env->gen.ioctls_debugged == 75)
     cdio_debug ("only displaying every 75th ioctl from now on");