diff --git a/components/editorControls/mediapicker/mediaChooser.cs b/components/editorControls/mediapicker/mediaChooser.cs
index 8fde2e5cc5..357cfc7372 100644
--- a/components/editorControls/mediapicker/mediaChooser.cs
+++ b/components/editorControls/mediapicker/mediaChooser.cs
@@ -12,7 +12,8 @@ namespace umbraco.editorControls
     /// </summary>
     [ClientDependency(100, ClientDependencyType.Css, "js/submodal/submodal.css", "UmbracoRoot")]
 	[ClientDependency(101, ClientDependencyType.Javascript, "js/submodal/common.js", "UmbracoRoot")]
-	[ClientDependency(102, ClientDependencyType.Javascript, "js/submodal/submodal.js", "UmbracoRoot", InvokeJavascriptMethodOnLoad = "initPopUp")]	
+    //TODO: Work out how to include this: , InvokeJavascriptMethodOnLoad = "initPopUp"
+    [ClientDependency(102, ClientDependencyType.Javascript, "js/submodal/submodal.js", "UmbracoRoot")]	
 	[ValidationProperty("Value")]
     public class mediaChooser : System.Web.UI.WebControls.HiddenField, interfaces.IDataEditor
     {
diff --git a/components/editorControls/pagepicker/pagePicker.cs b/components/editorControls/pagepicker/pagePicker.cs
index b359020a9c..c8c8a7cbac 100644
--- a/components/editorControls/pagepicker/pagePicker.cs
+++ b/components/editorControls/pagepicker/pagePicker.cs
@@ -12,7 +12,8 @@ namespace umbraco.editorControls
 	/// </summary>
 	[ClientDependency(100, ClientDependencyType.Css, "js/submodal/submodal.css", "UmbracoRoot")]
     [ClientDependency(101, ClientDependencyType.Javascript, "js/submodal/common.js", "UmbracoRoot")]
-	[ClientDependency(102, ClientDependencyType.Javascript, "js/submodal/submodal.js", "UmbracoRoot", InvokeJavascriptMethodOnLoad = "initPopUp")]	
+    //TODO: Work out how to include this: , InvokeJavascriptMethodOnLoad = "initPopUp"
+	[ClientDependency(102, ClientDependencyType.Javascript, "js/submodal/submodal.js", "UmbracoRoot")]	
     [ValidationProperty("Value")]
 	public class pagePicker : System.Web.UI.WebControls.HiddenField, interfaces.IDataEditor
 	{
diff --git a/components/umbraco.controls/Panel.cs b/components/umbraco.controls/Panel.cs
index dbf48603b3..d28db359a1 100644
--- a/components/umbraco.controls/Panel.cs
+++ b/components/umbraco.controls/Panel.cs
@@ -31,7 +31,7 @@ namespace umbraco.uicontrols {
             _menu.Visible = hasMenu;
 
             if(_autoResize)
-                this.Page.ClientScript.RegisterClientScriptBlock(this.GetType(), "PanelEvents", "<script type='text/javascript'>jQuery(document).ready(function() {jQuery(window).load(function(){ resizePanel('" + this.ClientID + "', " + this.hasMenu.ToString().ToLower() + ",true); }) });</script>");
+                this.Page.ClientScript.RegisterStartupScript(this.GetType(), "PanelEvents", "jQuery(document).ready(function() {jQuery(window).load(function(){ resizePanel('" + this.ClientID + "', " + this.hasMenu.ToString().ToLower() + ",true); }) });", true);
                 //this.Page.ClientScript.RegisterClientScriptBlock(this.GetType(), "PanelEvents", "<script type='text/javascript'>addEvent(window, \"load\", function(){ resizePanel('" + this.ClientID + "', " + this.hasMenu.ToString().ToLower() + "); }); addEvent(window, \"resize\", function(){ resizePanel('" + this.ClientID + "', " + this.hasMenu.ToString().ToLower() + "); });</script>");
         }
 
diff --git a/components/umbraco.controls/TabView.cs b/components/umbraco.controls/TabView.cs
index fbe5e1c4ae..a64101111c 100644
--- a/components/umbraco.controls/TabView.cs
+++ b/components/umbraco.controls/TabView.cs
@@ -69,11 +69,13 @@ namespace umbraco.uicontrols {
                     strTmp += ",";
                 strTmp += "\"" + this.ClientID + "_tab0" + i + "\"";
             }
-            this.Page.ClientScript.RegisterStartupScript(this.GetType(), this.ClientID + "TabCollection", "<script language='javascript'>var " + this.ClientID + "_tabs = new Array(" + strTmp + ");</script>");
-            this.Page.ClientScript.RegisterStartupScript(this.GetType(), this.ClientID + "TabviewStartUp", "<script language='javascript'>setActiveTab('" + this.ClientID + "','" + this.ActiveTabId + "'," + this.ClientID + "_tabs);</script>");
+            this.Page.ClientScript.RegisterStartupScript(
+                this.GetType(), 
+                this.ClientID + "TabCollection", ";var " + this.ClientID + "_tabs = new Array(" + strTmp + ");setActiveTab('" + this.ClientID + "','" + this.ActiveTabId + "'," + this.ClientID + "_tabs);",
+                true);
 
             if (_autoResize)
-                this.Page.ClientScript.RegisterClientScriptBlock(this.GetType(), "TabviewEvents", "<script type='text/javascript'>jQuery(document).ready(function(){resizeTabView(" + this.ClientID + "_tabs, '" + this.ClientID + "'); }); jQuery(window).resize(function(){ resizeTabView(" + this.ClientID + "_tabs, '" + this.ClientID + "'); });</script>");
+                this.Page.ClientScript.RegisterStartupScript(this.GetType(), "TabviewEvents", "jQuery(document).ready(function(){resizeTabView(" + this.ClientID + "_tabs, '" + this.ClientID + "'); }); jQuery(window).resize(function(){ resizeTabView(" + this.ClientID + "_tabs, '" + this.ClientID + "'); });", true);
         }
 
         protected override void Render(HtmlTextWriter writer) {