--- sites/all/modules/cdn2/cdn2.module	2009-06-05 01:26:36.000000000 +0000
+++ sites/all/modules/cdn2/cdn2.module	2009-06-11 18:27:58.000000000 +0000
@@ -360,7 +358,7 @@ function _cdn2_update_video_asset_status
     else {
       // update the video asset independent of node context
       $query = "UPDATE {cdn2_videos} SET status='%s', asset_fetch_url='%s', file_size='%s', video_length='%s' WHERE preset_name='%s' AND video_token='%s'";
-      db_query($query, $status, $asset_fetch_url, $preset_name, $video_token);
+      db_query($query, $status, $asset_fetch_url, $file_size, $video_length, $preset_name, $video_token);
     }
   }  
 
@@ -445,7 +443,7 @@ function cdn2_update_status($date_time, 
 function _cdn2_get_nid_by_video_token($content_type, $video_token) {
     $field_name = _cdn2_get_field_names_by_content_type($content_type);
     $query = "SELECT nid FROM {%s} WHERE %s = '%s'";
-    $result = db_query($query, 'content_type_'. $content_type, $field_name[0] .'_value', $video_token);
+    $result = db_query($query, 'content_'. $field_name[0], $field_name[0] .'_value', $video_token);
     $nid = db_fetch_object($result);
     return $nid->nid;
 }
@@ -966,7 +964,7 @@ function _cdn2_get_content_types() {
   $widget_info = cdn2_widget_info();
   $content_types = array();
   foreach ($widget_info as $key => $value) {
-    $query = "SELECT field_name FROM {node_field_instance} WHERE type_name='%s' AND widget_type='cdn2'";
+    $query = "SELECT type_name FROM {node_field_instance} WHERE widget_type='%s'";
     $result = db_query($query, $key);
     while ($row = db_fetch_object($result)) {
       $content_types[] = $row->type_name;
@@ -976,7 +974,7 @@ function _cdn2_get_content_types() {
 }
 
 function _cdn2_get_field_names_by_content_type($content_type) {
-    $query = "SELECT field_name FROM {node_field_instance} WHERE type_name='%s'";
+    $query = "SELECT field_name FROM {node_field_instance} WHERE type_name='%s' AND widget_type = 'cdn2'";
     $result = db_query($query, $content_type);
     while ($row = db_fetch_object($result)) {
       $field_names[] = $row->field_name;
@@ -1026,4 +1024,4 @@ function cdn2_status_page($video_token =
     }
     return theme('table', $header, $rows);
   }
-}
\ No newline at end of file
+}