diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/code-editor/code-editor-modal.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/code-editor/code-editor-modal.stories.ts
index ebc4a89abe..a0ae9b74a6 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/code-editor/code-editor-modal.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/code-editor/code-editor-modal.stories.ts
@@ -13,6 +13,7 @@ export default {
 const data: UmbCodeEditorModalData = {
 	headline: 'Code editor modal example',
 	content: `<b>This example</b> opens an HTML <i>string</i> in the Code Editor modal.`,
+	language: 'html',
 };
 
 export const Overview: Story<UmbCodeEditorModalData> = () => html`
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/plugins/tiny-mce-mediapicker.plugin.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/plugins/tiny-mce-mediapicker.plugin.ts
index 89585a5ec2..e1354f1985 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/plugins/tiny-mce-mediapicker.plugin.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/tiny-mce/plugins/tiny-mce-mediapicker.plugin.ts
@@ -1,9 +1,9 @@
-import type { UserDetails } from '@umbraco-cms/backoffice/models';
-import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
 import { UmbMediaPickerModalResult, UMB_MEDIA_PICKER_MODAL_TOKEN } from '../../../../../media/media/modals/media-picker';
 import { UmbCurrentUserStore, UMB_CURRENT_USER_STORE_CONTEXT_TOKEN } from '../../../../../users/current-user/current-user.store';
 import { UmbMediaHelper } from '../../../../../../../libs/utils/media-helper.service';
 import { TinyMcePluginArguments, TinyMcePluginBase } from './tiny-mce-plugin';
+import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
+import type { UserDetails } from '@umbraco-cms/backoffice/models';
 
 interface MediaPickerTargetData {
 	altText?: string;
@@ -31,7 +31,7 @@ export class TinyMceMediaPickerPlugin extends TinyMcePluginBase {
 	constructor(args: TinyMcePluginArguments) {
 		super(args);
 
-		this.#mediaHelper = new UmbMediaHelper(this.host);
+		this.#mediaHelper = new UmbMediaHelper();
 
 		this.host.consumeContext(UMB_MODAL_CONTEXT_TOKEN, (instance: UmbModalContext) => {
 			this.#modalContext = instance;
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/rte-embed.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/rte-embed.handlers.ts
index 82d4d964db..115e08d13c 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/rte-embed.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/rte-embed.handlers.ts
@@ -5,8 +5,9 @@ import { umbracoPath } from "@umbraco-cms/backoffice/utils";
 
 export const handlers = [
 	rest.get(umbracoPath('/rteembed'), (req, res, ctx) => {
-		const width = req.url.searchParams.get('width') ?? ModalElement.defaultWidth;
-		const height = req.url.searchParams.get('height') ?? ModalElement.defaultHeight;
+		const params = req.url.searchParams;
+		const width = params.get('width') ? parseInt(params.get('width')!, 10) : ModalElement.defaultWidth;
+		const height = params.get('height') ? parseInt(params.get('height')!, 10) : ModalElement.defaultHeight;
 		const url = req.url.searchParams.get('url');
 
 		let embedUrl = 'https://www.youtube.com/embed/wJNbtYdr-Hg';