Index: ec_cart/ec_cart.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ecommerce/ec_cart/ec_cart.module,v
retrieving revision 1.5.2.19
diff -u -r1.5.2.19 ec_cart.module
--- ec_cart/ec_cart.module	13 Jan 2009 22:59:23 -0000	1.5.2.19
+++ ec_cart/ec_cart.module	9 Feb 2009 04:37:30 -0000
@@ -340,7 +340,7 @@
   // I think we've already validated the items, but we're doing it again
   // before sending to the checkout.
   foreach ($txn->items as $nid => $item) {
-    ec_checkout_validate_item($item, 'ec_cart', $item->qty, $item_data, EC_VALIDATE_ITEM_SEVERITY_HIGH);
+    ec_checkout_validate_item($item, 'ec_cart', $item->qty, $item->data, EC_VALIDATE_ITEM_SEVERITY_HIGH);
   }
   $errors = form_get_errors();
   if (!empty($errors)) {
@@ -383,7 +383,7 @@
     $form['products'][$item->nid]['#node'] = $item;
 
     // Some stuff that is to be moved out of ec_cart.
-    ec_cart_view_cart_to_move($form, $node);
+    ec_cart_view_cart_to_move($form, $item);
 
     // Add quantity elements.
     if (ec_product_has_quantity($item)) {
@@ -400,7 +400,7 @@
       );
     }
 
-    if (ec_product_attributes_get($node, 'product_form_additional_fields')) {
+    if (ec_product_attributes_get($item, 'product_form_additional_fields')) {
       $form['#product_cart_form'] = TRUE;
       // Add place holder for additional data and fields.
       $form['products'][$item->nid]['data'] = array();
Index: ec_address/ec_address.views.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ecommerce/ec_address/ec_address.views.inc,v
retrieving revision 1.3.2.1
diff -u -r1.3.2.1 ec_address.views.inc
--- ec_address/ec_address.views.inc	20 Nov 2008 20:07:21 -0000	1.3.2.1
+++ ec_address/ec_address.views.inc	9 Feb 2009 04:37:29 -0000
@@ -141,7 +141,4 @@
       ),
     ),
   );
-
-  return $data;
 }
-
Index: ec_address/ec_address.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ecommerce/ec_address/ec_address.module,v
retrieving revision 1.4
diff -u -r1.4 ec_address.module
--- ec_address/ec_address.module	22 Oct 2008 12:49:08 -0000	1.4
+++ ec_address/ec_address.module	9 Feb 2009 04:37:29 -0000
@@ -124,6 +124,7 @@
   module_load_include('inc', 'ec_store', 'ec_store.localization');
   $states = _ec_store_location_states($country);
 
+  $counter = 0;
   if (!empty($states)) {
     while (list($code, $name) = each($states)) {
       if ($counter < 5) {