Index: modules/node_deploy/node_deploy.module
===================================================================
--- modules/node_deploy/node_deploy.module	(revision 400)
+++ modules/node_deploy/node_deploy.module	(working copy)
@@ -184,7 +184,6 @@
     }
     $node->taxonomy = $taxonomy;
   }
-  
   // add this flag because on the other side, there's some special stuff
   // done in nodeapi specifically related to deployed nodes vs non-deployed
   $node->deploy = TRUE;
@@ -194,8 +193,8 @@
   unset($node->teaser_js);
   
   // Now let all the modules that extend node make their own adjustments
-  module_invoke_all('node_deploy', $node);
-
+  module_invoke_all('node_deploy', $node, $nid);
+  
   // And we're off.
   $nid = deploy_send(array('node.save'), array($node));
 
Index: modules/date_deploy/date_deploy.module
===================================================================
--- modules/date_deploy/date_deploy.module	(revision 400)
+++ modules/date_deploy/date_deploy.module	(working copy)
@@ -13,7 +13,8 @@
   if (empty($date_fields)) {
     $fields = content_fields();
     foreach ($fields as $name => $field) {
-      if ($field['type'] == 'date') {
+        $date_types = array('datetime', 'date');
+      if (in_array($field['type'], $date_types) ) {
         $date_fields[$name] = $name;
       }
     }
@@ -32,14 +33,13 @@
  *
  * @todo big report with date to avoid the node_lod() below
  */
-function date_node_deploy(&$node) {
+function date_node_deploy(&$node, $local_nid) {
   // There is a bug somewhere in the FAPI munging in node_deploy() that 
   // causes date values to get trashed. In order to get around this, we
   // actually need to node_load() each node as it comes through in order
   // to retrieve the original date value. !shoot($messenger)
-  $original_node = node_load($node->nid);
+  $original_node = node_load($local_nid);
   $date_fields = date_deploy_get_date_fields();
-  
   // The dates need to be saved as $node->field[delta]['value'][part]
   foreach ($date_fields as $field_name) {