diff --git a/api/src/Framework.php b/api/src/Framework.php
index 9c4c6faf7b..9eb1bdeab1 100644
--- a/api/src/Framework.php
+++ b/api/src/Framework.php
@@ -722,6 +722,7 @@ abstract class Framework extends Framework\Extra
 	 * @param string $password =null password --------- " ----------
 	 * @param array $opts =array() further params for http(s) context, eg. array('timeout' => 123)
 	 * @return resource|null context to use with file_get_context/fopen or null if no proxy configured
+	 * @noinspection UnsupportedStringOffsetOperationsInspection
 	 */
 	public static function proxy_context($username=null, $password=null, array $opts = array())
 	{
@@ -1117,7 +1118,7 @@ abstract class Framework extends Framework\Extra
 			$GLOBALS['egw_info']['flags']['java_script'] = preg_replace(array('/(<script[^>]*>)([^<]*)/is','/<\/script>/'),array('$2',''),$GLOBALS['egw_info']['flags']['java_script']);
 			if(trim($GLOBALS['egw_info']['flags']['java_script']) != '')
 			{
-				$java_script .= '<script type="text/javascript">window.egw_LAB.wait(function() {'.$GLOBALS['egw_info']['flags']['java_script'] . "});</script>\n";
+				$java_script .= '<script type="text/javascript">top.egw_ready.then(() => { const egw=top.egw, jQuery=top.jQuery; '.$GLOBALS['egw_info']['flags']['java_script'] . "});</script>\n";
 			}
 		}
 
@@ -1701,6 +1702,7 @@ abstract class Framework extends Framework\Extra
 		$list = array();
 		foreach((array)$_account_ids as $account_id)
 		{
+			/** @noinspection SuspiciousLoopInspection */
 			foreach($account_id < 0 && $_resolve_groups ?
 				$GLOBALS['egw']->accounts->members($account_id, true) : array($account_id) as $account_id)
 			{
diff --git a/api/src/Html.php b/api/src/Html.php
index 315b67bc93..5f326c15d7 100644
--- a/api/src/Html.php
+++ b/api/src/Html.php
@@ -1,4 +1,5 @@
-<?php
+<?php /** @noinspection SuspiciousLoopInspection */
+
 /**
  * EGroupware API: generates html with methods representing html-tags or higher widgets
  *
@@ -215,7 +216,7 @@ class Html
 		if($enhanced) {
 			Framework::includeJS('/api/js/jquery/chosen/chosen.jquery.js');
 			Framework::includeCSS('/api/js/jquery/chosen/chosen.css',null,false);
-			$out .= "<script>var lab = egw_LAB || \$LAB; lab.wait(function() {jQuery(function() {if(jQuery().chosen) jQuery('select[name=\"$name\"]').chosen({width: '100%'});});})</script>\n";
+			$out .= "<script>top.egw_ready.then(() => { const egw=top.egw, jQuery=top.jQuery; jQuery(function() {if(jQuery().chosen) jQuery('select[name=\"$name\"]').chosen({width: '100%'});});})</script>\n";
 		}
 		return $out;
 	}
@@ -469,8 +470,8 @@ class Html
 '
 <script type="text/javascript">
 
-egw_LAB.wait(function() {
-
+top.egw_ready.then(() => { 
+const egw=top.egw, jQuery=top.jQuery, tinymce=top.tinymce; 
 var imageUpload = egw.ajaxUrl("EGroupware\\Api\\Etemplate\\Widget\\Vfs::ajax_htmlarea_upload")+"&type=htmlarea";
 imageUpload = imageUpload.substr(egw.webserverUrl.length+1);
 var font_size_formats = {
@@ -1229,7 +1230,7 @@ tinymce.init({
 		$html = self::div("\n",'id="'.$tree.'"',$_divClass);
 		$html .= "<script type='text/javascript'>\n";
 		$html .= "var $tree;";
-		$html .= "egw_LAB.wait(function() {";
+		$html .= "top.egw_ready.then(() => { const egw=top.egw, dhtmlXTreeObject=top.dhtmlXTreeObject; ";
 		$html .= "$tree = new"." dhtmlXTreeObject('$tree','100%','100%',0);\n";
 		$html .= "$tree.parentObject.style.overflow='auto';\n";	// dhtmlXTree constructor has hidden hardcoded
 		if (Translation::charset() == 'utf-8') $html .= "if ($tree.setEscapingMode) $tree.setEscapingMode('utf8');\n";