diff --git a/_config.php b/_config.php
index e3088201..fc4e6a00 100644
--- a/_config.php
+++ b/_config.php
@@ -42,7 +42,7 @@ HtmlEditorConfig::get('cms')->setOptions(array(
 ));
 
 
-HtmlEditorConfig::get('cms')->enablePlugins('media', '../../tinymce_ssbuttons', 'fullscreen');
+HtmlEditorConfig::get('cms')->enablePlugins('media', '../../../../cms/javascript/tinymce_ssbuttons', 'fullscreen');
 			
 HtmlEditorConfig::get('cms')->insertButtonsBefore('formatselect', 'styleselect');
 HtmlEditorConfig::get('cms')->insertButtonsBefore('advcode', 'ssimage', 'ssflash', 'sslink', 'unlink', 'anchor', 'separator' );
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index c0b97798..7e03ece8 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -275,7 +275,6 @@ class LeftAndMain extends Controller {
 				'sapphire/thirdparty/scriptaculous/controls.js',
 				'cms/javascript/LeftAndMain.js',
 				'sapphire/javascript/tree/tree.js',
-				'cms/javascript/TinyMCEImageEnhancement.js',
 				'sapphire/thirdparty/swfupload/swfupload/swfupload.js',
 				'cms/javascript/Upload.js',
 				'cms/javascript/TinyMCEImageEnhancement.js',
diff --git a/javascript/TinyMCEImageEnhancement.js b/javascript/TinyMCEImageEnhancement.js
index d5a43cad..f550af70 100644
--- a/javascript/TinyMCEImageEnhancement.js
+++ b/javascript/TinyMCEImageEnhancement.js
@@ -218,4 +218,8 @@ TinyMCEImageEnhancement.prototype = {
         return  $('Form_EditorToolbarImageForm_FolderID').value == '' ? 'root' : $('Form_EditorToolbarImageForm_FolderID').value;
     }
 }
-tinyMCEImageEnhancement = new TinyMCEImageEnhancement();
+var tinyMCEImageEnhancement;
+
+jQuery(function() {
+	tinyMCEImageEnhancement = new TinyMCEImageEnhancement();
+});
diff --git a/javascript/Upload.js b/javascript/Upload.js
index 1dad0571..3d755666 100644
--- a/javascript/Upload.js
+++ b/javascript/Upload.js
@@ -74,7 +74,7 @@ Upload.prototype = {
 				button_window_mode : "transparent",
 				button_width : this.buttonWidth,
 				button_height : this.buttonHeight,
-				flash_url : 'sapphire/thirdparty/swfupload/swfupload/swfupload.swf',	// Relative to this file
+				flash_url : 'sapphire/thirdparty/swfupload/swfupload/swfupload.swf',
 				swfupload_loaded_handler: this.buildUI.bind(this),
 				debug: false,
 				preserve_relative_urls: true