diff --git a/api/src/Db.php b/api/src/Db.php
index 607335ac4a..a6ece4875f 100644
--- a/api/src/Db.php
+++ b/api/src/Db.php
@@ -828,6 +828,7 @@ class Db
 		{
 			fwrite($f,'['.(isset($GLOBALS['egw_setup']) ? $GLOBALS['egw_setup']->ConfigDomain : $GLOBALS['egw_info']['user']['domain']).'] ');
 			fwrite($f,date('Y-m-d H:i:s ').$Query_String.($inputarr ? "\n".print_r($inputarr,true) : '')."\n");
+			fwrite($f, function_backtrace()."\n");
 			if (!$rs)
 			{
 				fwrite($f,"*** Error $this->Errno: $this->Error\n".function_backtrace()."\n");
diff --git a/api/src/Framework.php b/api/src/Framework.php
index c83ee654e6..663d99bec5 100644
--- a/api/src/Framework.php
+++ b/api/src/Framework.php
@@ -1046,7 +1046,7 @@ abstract class Framework extends Framework\Extra
 		}
 		// add configuration, link-registry, images, user-data and -preferences for non-popup windows
 		// specifying etag in url to force reload, as we send expires header
-		if ($GLOBALS['egw_info']['flags']['js_link_registry'] || isset($_GET['cd']) && $_GET['cd'] === 'popup')
+		if ($GLOBALS['egw_info']['flags']['js_link_registry'] || !isset($_GET['cd']) || isset($_GET['cd']) && $_GET['cd'] === 'popup')
 		{
 			self::includeJS('/api/config.php', array(
 				'etag' => md5(json_encode(Config::clientConfigs()).Link::json_registry()),
diff --git a/api/src/Html.php b/api/src/Html.php
index 4e775d7fd3..3689864a40 100644
--- a/api/src/Html.php
+++ b/api/src/Html.php
@@ -469,7 +469,8 @@ class Html
 '
 <script type="text/javascript">
 
-egw_LAB.wait(function() {
+window.setTimeout(function() {
+    window.egw_ready.wait(function() {
 
 var imageUpload = egw.ajaxUrl("EGroupware\\Api\\Etemplate\\Widget\\Vfs::ajax_htmlarea_upload")+"&type=htmlarea";
 imageUpload = imageUpload.substr(egw.webserverUrl.length+1);
@@ -503,6 +504,7 @@ var language_code = {
 	"zh-tw": "zh_TW"
 };
 tinymce.init({
+			base_url: egw.webserverUrl + "/vendor/tinymce/tinymce",
 			selector: name,
 			menubar: parseInt('. $rte_menubar.')? true : false,
 			branding: false,
@@ -575,7 +577,8 @@ tinymce.init({
 			fontsize_formats:font_size_formats["'. $font_size_unit.'"],
 		});
 		'.($_executeJSAfterInit?$_executeJSAfterInit:'').'
-});
+	});
+}, 200);
 </script>
 ';
 	}