diff -ur sonic-rainbow/src/cdplayer.c sonic-rainbow-BETA-0.6.2.2-fix/src/cdplayer.c
--- sonic-rainbow/src/cdplayer.c	2004-07-10 06:11:22.000000000 +0200
+++ sonic-rainbow-BETA-0.6.2.2-fix/src/cdplayer.c	2007-04-22 21:03:05.000000000 +0200
@@ -474,7 +474,7 @@
 {
   for(i=1;i<matches;i++)
   {
-   if(id==disc->discid)break;
+   if(id==cddb_disc_calc_discid(disc))break;
    back=cddb_query_next(conn,disc);
    }
 
diff -ur sonic-rainbow/src/cdripper.c sonic-rainbow-BETA-0.6.2.2-fix/src/cdripper.c
--- sonic-rainbow/src/cdripper.c	2004-07-10 06:11:22.000000000 +0200
+++ sonic-rainbow-BETA-0.6.2.2-fix/src/cdripper.c	2007-04-22 21:03:40.000000000 +0200
@@ -1168,7 +1168,7 @@
 {
 for(i=1;i<matches;i++)
 {
-if(id==disc->discid)break;
+if(id==cddb_disc_calc_discid(disc))break;
 back=cddb_query_next(conn,disc);
 }
 
diff -ur sonic-rainbow/src/oggplayer.c sonic-rainbow-BETA-0.6.2.2-fix/src/oggplayer.c
--- sonic-rainbow/src/oggplayer.c	2004-07-10 06:11:22.000000000 +0200
+++ sonic-rainbow-BETA-0.6.2.2-fix/src/oggplayer.c	2007-04-22 21:05:54.000000000 +0200
@@ -231,7 +231,7 @@
 dowhat=-1;
 
 
-db=data->data;
+db=(char *)data->data;
 
 
 while(1)
@@ -3046,7 +3046,7 @@
 	}
 	}
 
-(long)x=ftell(fptr);
+x=(float)ftell(fptr);
 x=x/length;
 x=x*100;