diff --git a/src/driver.c b/src/driver.c
index 9d39ef3..a6af597 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -423,15 +423,15 @@ gen_tbl (int tnum, DSS_HUGE start, DSS_HUGE count, long upd_num)
 	static int init = 0;
 	DSS_HUGE i;
 
-	int rows_per_segment=0;
-	int rows_this_segment=-1;
-	int residual_rows=0;
+    DSS_HUGE rows_per_segment=0;
+    DSS_HUGE rows_this_segment=-1;
+    DSS_HUGE residual_rows=0;
 
 	if (insert_segments)
-		{
+    {
 		rows_per_segment = count / insert_segments;
 		residual_rows = count - (rows_per_segment * insert_segments);
-		}
+    }
 
 	if (init == 0)
 	{
@@ -1169,7 +1169,7 @@ main (int ac, char **av)
 					rowcnt = tdefs[i].base;
 #ifdef SSB
 				if(i==PART){
-					rowcnt = tdefs[i].base * (floor(1+log((double)(scale))/(log(2))));
+                    rowcnt = tdefs[i].base * (long)(floor(1+log((double)(scale))/(log(2))));
 				}
 				if(i==DATE){
 					rowcnt = tdefs[i].base;
diff --git a/src/dss.h b/src/dss.h
index 5b21671..6d43190 100644
--- a/src/dss.h
+++ b/src/dss.h
@@ -392,7 +392,7 @@ extern tdef tdefs[];
 
 #ifdef SSB
 /*part table log based*/
-#define  L_PKEY_MAX   (tdefs[PART].base * (floor(log((double)scale))+1))
+#define  L_PKEY_MAX   (tdefs[PART].base * ((long)floor(log((double)scale))+1))
 #else
 #define  L_PKEY_MAX   (tdefs[PART].base * scale)
 #endif
diff --git a/src/print.c b/src/print.c
index e64dd82..58f1f41 100644
--- a/src/print.c
+++ b/src/print.c
@@ -550,12 +550,12 @@ pr_drange(int tbl, DSS_HUGE min, DSS_HUGE cnt, long num)
 {
     static long  last_num = 0;
     static FILE *dfp = NULL;
-    int child = -1;
-    long start, last, new;
+    DSS_HUGE child = -1;
+    DSS_HUGE start, last, new;
 
-	static int rows_per_segment=0;
-	static int rows_this_segment=0;
-	static int residual_rows=0;
+    static DSS_HUGE rows_per_segment=0;
+    static DSS_HUGE rows_this_segment=0;
+    static DSS_HUGE residual_rows=0;
 
     if (last_num != num)
         {
diff --git a/src/speed_seed.c b/src/speed_seed.c
index 9af3112..fc4bded 100644
--- a/src/speed_seed.c
+++ b/src/speed_seed.c
@@ -254,7 +254,7 @@ sd_part(int child, long skip_count)
 }
 
 long 
-sd_line(int child, long skip_count)
+sd_line(int child, DSS_HUGE skip_count)
 	{
 	int i,j;
 	
@@ -276,7 +276,7 @@ sd_line(int child, long skip_count)
 	}
 
 long 
-sd_order(int child, long skip_count)        
+sd_order(int child, DSS_HUGE skip_count)
 {
    UNUSED(child);
    ADVANCE_STREAM(O_LCNT_SD, skip_count);