diff --git a/src/main/scala/com/databricks/spark/sql/perf/tpcds/Tables.scala b/src/main/scala/com/databricks/spark/sql/perf/tpcds/Tables.scala
index 414e04d..d6b8065 100644
--- a/src/main/scala/com/databricks/spark/sql/perf/tpcds/Tables.scala
+++ b/src/main/scala/com/databricks/spark/sql/perf/tpcds/Tables.scala
@@ -277,7 +277,7 @@ class Tables(sqlContext: SQLContext, dsdgenDir: String, scaleFactor: Int) extend
       'cs_warehouse_sk          .int,
       'cs_item_sk               .int,
       'cs_promo_sk              .int,
-      'cs_order_number          .int,
+      'cs_order_number          .long,
       'cs_quantity              .int,
       'cs_wholesale_cost        .decimal(7,2),
       'cs_list_price            .decimal(7,2),
@@ -312,7 +312,7 @@ class Tables(sqlContext: SQLContext, dsdgenDir: String, scaleFactor: Int) extend
       'cr_ship_mode_sk          .int,
       'cr_warehouse_sk          .int,
       'cr_reason_sk             .int,
-      'cr_order_number          .int,
+      'cr_order_number          .long,
       'cr_return_quantity       .int,
       'cr_return_amount         .decimal(7,2),
       'cr_return_tax            .decimal(7,2),
@@ -340,7 +340,7 @@ class Tables(sqlContext: SQLContext, dsdgenDir: String, scaleFactor: Int) extend
       'ss_addr_sk           .int,
       'ss_store_sk          .int,
       'ss_promo_sk          .int,
-      'ss_ticket_number     .int,
+      'ss_ticket_number     .long,
       'ss_quantity          .int,
       'ss_wholesale_cost    .decimal(7,2),
       'ss_list_price        .decimal(7,2),
@@ -356,17 +356,17 @@ class Tables(sqlContext: SQLContext, dsdgenDir: String, scaleFactor: Int) extend
       'ss_net_profit        .decimal(7,2)),
     Table("store_returns",
       partitionColumns = "sr_returned_date_sk" ::Nil,
-      'sr_returned_date_sk  .long,
-      'sr_return_time_sk    .long,
-      'sr_item_sk           .long,
-      'sr_customer_sk       .long,
-      'sr_cdemo_sk          .long,
-      'sr_hdemo_sk          .long,
-      'sr_addr_sk           .long,
-      'sr_store_sk          .long,
-      'sr_reason_sk         .long,
+      'sr_returned_date_sk  .int,
+      'sr_return_time_sk    .int,
+      'sr_item_sk           .int,
+      'sr_customer_sk       .int,
+      'sr_cdemo_sk          .int,
+      'sr_hdemo_sk          .int,
+      'sr_addr_sk           .int,
+      'sr_store_sk          .int,
+      'sr_reason_sk         .int,
       'sr_ticket_number     .long,
-      'sr_return_quantity   .long,
+      'sr_return_quantity   .int,
       'sr_return_amt        .decimal(7,2),
       'sr_return_tax        .decimal(7,2),
       'sr_return_amt_inc_tax.decimal(7,2),
@@ -395,7 +395,7 @@ class Tables(sqlContext: SQLContext, dsdgenDir: String, scaleFactor: Int) extend
       'ws_ship_mode_sk          .int,
       'ws_warehouse_sk          .int,
       'ws_promo_sk              .int,
-      'ws_order_number          .int,
+      'ws_order_number          .long,
       'ws_quantity              .int,
       'ws_wholesale_cost        .decimal(7,2),
       'ws_list_price            .decimal(7,2),
@@ -414,21 +414,21 @@ class Tables(sqlContext: SQLContext, dsdgenDir: String, scaleFactor: Int) extend
       'ws_net_profit            .decimal(7,2)),
     Table("web_returns",
       partitionColumns = "wr_returned_date_sk" ::Nil,
-      'wr_returned_date_sk      .long,
-      'wr_returned_time_sk      .long,
-      'wr_item_sk               .long,
-      'wr_refunded_customer_sk  .long,
-      'wr_refunded_cdemo_sk     .long,
-      'wr_refunded_hdemo_sk     .long,
-      'wr_refunded_addr_sk      .long,
-      'wr_returning_customer_sk .long,
-      'wr_returning_cdemo_sk    .long,
-      'wr_returning_hdemo_sk    .long,
-      'wr_returning_addr_sk     .long,
-      'wr_web_page_sk           .long,
-      'wr_reason_sk             .long,
+      'wr_returned_date_sk      .int,
+      'wr_returned_time_sk      .int,
+      'wr_item_sk               .int,
+      'wr_refunded_customer_sk  .int,
+      'wr_refunded_cdemo_sk     .int,
+      'wr_refunded_hdemo_sk     .int,
+      'wr_refunded_addr_sk      .int,
+      'wr_returning_customer_sk .int,
+      'wr_returning_cdemo_sk    .int,
+      'wr_returning_hdemo_sk    .int,
+      'wr_returning_addr_sk     .int,
+      'wr_web_page_sk           .int,
+      'wr_reason_sk             .int,
       'wr_order_number          .long,
-      'wr_return_quantity       .long,
+      'wr_return_quantity       .int,
       'wr_return_amt            .decimal(7,2),
       'wr_return_tax            .decimal(7,2),
       'wr_return_amt_inc_tax    .decimal(7,2),
@@ -532,7 +532,7 @@ class Tables(sqlContext: SQLContext, dsdgenDir: String, scaleFactor: Int) extend
       partitionColumns = Nil,
       'd_date_sk                 .int,
       'd_date_id                 .string,
-      'd_date                    .string,
+      'd_date                    .date,
       'd_month_seq               .int,
       'd_week_seq                .int,
       'd_quarter_seq             .int,
@@ -574,8 +574,8 @@ class Tables(sqlContext: SQLContext, dsdgenDir: String, scaleFactor: Int) extend
       partitionColumns = Nil,
       'i_item_sk                 .int,
       'i_item_id                 .string,
-      'i_rec_start_date          .string,
-      'i_rec_end_date            .string,
+      'i_rec_start_date          .date,
+      'i_rec_end_date            .date,
       'i_item_desc               .string,
       'i_current_price           .decimal(7,2),
       'i_wholesale_cost          .decimal(7,2),
@@ -632,8 +632,8 @@ class Tables(sqlContext: SQLContext, dsdgenDir: String, scaleFactor: Int) extend
       partitionColumns = Nil,
       's_store_sk                .int,
       's_store_id                .string,
-      's_rec_start_date          .string,
-      's_rec_end_date            .string,
+      's_rec_start_date          .date,
+      's_rec_end_date            .date,
       's_closed_date_sk          .int,
       's_store_name              .string,
       's_number_employees        .int,
@@ -729,7 +729,7 @@ class Tables(sqlContext: SQLContext, dsdgenDir: String, scaleFactor: Int) extend
       'web_state                .string,
       'web_zip                  .string,
       'web_country              .string,
-      'web_gmt_offset           .string,
+      'web_gmt_offset           .decimal(5,2),
       'web_tax_percentage       .decimal(5,2))
   )
 }