--- img_assist.module.old	Sun Apr 06 19:32:34 2008
+++ img_assist.module	Fri Jun 06 15:42:20 2008
@@ -497,7 +497,11 @@ function img_assist_loader() {
   $path = drupal_get_path('module', 'img_assist');
   $output .= '<script type="text/javascript" src="'. base_path() . $path .'/img_assist.js"></script>'."\n";
   if ($editor == 'tinymce') {
-    $tinymce_path = drupal_get_path('module', 'tinymce');
+    $tinymce_path = drupal_get_path('module', 'tinytinymce');
+    
     $tinymce_js = base_path() . $tinymce_path .'/tinymce/jscripts/tiny_mce/tiny_mce_popup.js';
     $output .= '<script type="text/javascript" src="'. $tinymce_js .'"></script>' . "\n";
   }
@@ -1737,7 +1741,7 @@ function theme_img_assist_page($content,
   $output .= drupal_get_js();
   $output .= "\n<script type=\"text/javascript\"><!-- \n";
   $output .= "  if (parent.tinyMCE) {\n";
-  $output .= "    document.write('<link href=\"' + parent.tinyMCE.getParam(\"popups_css\") + '\" rel=\"stylesheet\" type=\"text/css\">');\n";
+  $output .= "    document.write('<link href=\"' + parent.tinyMCE.activeEditor.getParam(\"popups_css\") + '\" rel=\"stylesheet\" type=\"text/css\">');\n";
   $output .= "  } else {\n";
   foreach (drupal_add_css() as $media => $type) {
     $paths = array_merge($type['module'], $type['theme']);