diff --git a/lib/_cdio_bincue.c b/lib/_cdio_bincue.c
index 2a4814d3..915a0d38 100644
--- a/lib/_cdio_bincue.c
+++ b/lib/_cdio_bincue.c
@@ -1,5 +1,5 @@
 /*
-    $Id: _cdio_bincue.c,v 1.2 2003/03/29 17:32:00 rocky Exp $
+    $Id: _cdio_bincue.c,v 1.3 2003/03/29 21:13:55 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: _cdio_bincue.c,v 1.2 2003/03/29 17:32:00 rocky Exp $";
+static const char _rcsid[] = "$Id: _cdio_bincue.c,v 1.3 2003/03/29 21:13:55 rocky Exp $";
 
 #include <stdio.h>
 #include <ctype.h>
@@ -173,6 +173,7 @@ _cdio_lseek (void *user_data, off_t offset, int whence)
       user_datasize=FORM1_DATA_SIZE;
       break;
     default:
+      user_datasize=CD_RAW_SECTOR_SIZE;
       cdio_warn ("track %d has unknown format %d",
 		 i+1, this_track->track_format);
     }
diff --git a/lib/_cdio_generic.c b/lib/_cdio_generic.c
index 174c671f..11266079 100644
--- a/lib/_cdio_generic.c
+++ b/lib/_cdio_generic.c
@@ -1,5 +1,5 @@
 /*
-    $Id: _cdio_generic.c,v 1.1 2003/03/29 17:32:00 rocky Exp $
+    $Id: _cdio_generic.c,v 1.2 2003/03/29 21:13:55 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.1 2003/03/29 17:32:00 rocky Exp $";
+static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.2 2003/03/29 21:13:55 rocky Exp $";
 
 #include "cdio_assert.h"
 #include "cdio_private.h"
@@ -41,7 +41,6 @@ static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.1 2003/03/29 17:32:00 roc
 #include <unistd.h>
 #include <fcntl.h>
 
-#include <linux/cdrom.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/lib/_cdio_nrg.c b/lib/_cdio_nrg.c
index 0ee6e0c4..be08123c 100644
--- a/lib/_cdio_nrg.c
+++ b/lib/_cdio_nrg.c
@@ -1,5 +1,5 @@
 /*
-    $Id: _cdio_nrg.c,v 1.2 2003/03/29 17:32:00 rocky Exp $
+    $Id: _cdio_nrg.c,v 1.3 2003/03/29 21:13:55 rocky Exp $
 
     Copyright (C) 2001,2003 Herbert Valerio Riedel <hvr@gnu.org>
 
@@ -38,7 +38,7 @@
 #include "util.h"
 #include "_cdio_stdio.h"
 
-static const char _rcsid[] = "$Id: _cdio_nrg.c,v 1.2 2003/03/29 17:32:00 rocky Exp $";
+static const char _rcsid[] = "$Id: _cdio_nrg.c,v 1.3 2003/03/29 21:13:55 rocky Exp $";
 
 /* structures used */
 
@@ -530,6 +530,7 @@ _cdio_lseek (void *user_data, off_t offset, int whence)
       user_datasize=FORM1_DATA_SIZE;
       break;
     default:
+      user_datasize=CD_RAW_SECTOR_SIZE;
       cdio_warn ("track %d has unknown format %d",
 		 i+1, this_track->track_format);
     }
diff --git a/lib/_cdio_sunos.c b/lib/_cdio_sunos.c
index 345116ef..a09e05b9 100644
--- a/lib/_cdio_sunos.c
+++ b/lib/_cdio_sunos.c
@@ -1,5 +1,5 @@
 /*
-    $Id: _cdio_sunos.c,v 1.3 2003/03/29 20:28:05 rocky Exp $
+    $Id: _cdio_sunos.c,v 1.4 2003/03/29 21:13:55 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
@@ -31,7 +31,7 @@
 
 #ifdef HAVE_SOLARIS_CDROM
 
-static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.3 2003/03/29 20:28:05 rocky Exp $";
+static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.4 2003/03/29 21:13:55 rocky Exp $";
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -95,11 +95,11 @@ _cdio_init (_img_private_t *_obj)
 
   struct dk_cinfo cinfo;
 
-  _obj->gen.fd = open (_obj->source_name, O_RDONLY, 0);
+  _obj->gen.fd = open (_obj->gen.source_name, O_RDONLY, 0);
 
   if (_obj->gen.fd < 0)
     {
-      cdio_error ("open (%s): %s", _obj->source_name, strerror (errno));
+      cdio_error ("open (%s): %s", _obj->gen.source_name, strerror (errno));
       return false;
     }
 
@@ -306,9 +306,9 @@ _cdio_set_arg (void *user_data, const char key[], const char value[])
       if (!value)
 	return -2;
 
-      free (_obj->source_name);
+      free (_obj->gen.source_name);
       
-      _obj->source_name = strdup (value);
+      _obj->gen.source_name = strdup (value);
     }
   else if (!strcmp (key, "access-mode"))
     {
@@ -416,7 +416,7 @@ _cdio_get_arg (void *user_data, const char key[])
   _img_private_t *_obj = user_data;
 
   if (!strcmp (key, "source")) {
-    return _obj->source_name;
+    return _obj->gen.source_name;
   } else if (!strcmp (key, "access-mode")) {
     switch (_obj->access_mode) {
     case _AM_SUN_CTRL_ATAPI: