diff --git a/app/webapp/cc/DebugTool.fragment.xml b/app/webapp/cc/DebugTool.fragment.xml
index 1aae7dfe..95e977e0 100644
--- a/app/webapp/cc/DebugTool.fragment.xml
+++ b/app/webapp/cc/DebugTool.fragment.xml
@@ -11,7 +11,7 @@
     >
         <IconTabHeader
             selectedKey="PLAIN"
-            select="onItemSelect"
+            select=".onItemSelect"
         >
             <items>
 		        <IconTabFilter
@@ -83,7 +83,7 @@
             </items>
         </IconTabHeader>
 			<VBox>
-				<ToggleButton text="Source XML after Templating" visible="{/isTemplating}" pressed="{/templatingSource}" press="onTemplatingPress" />
+				<ToggleButton text="Source XML after Templating" visible="{/isTemplating}" pressed="{/templatingSource}" press=".onTemplatingPress" />
         <ce:CodeEditor
             type="{/type}"
             value="{/value}"
@@ -97,7 +97,7 @@
         <endButton>
             <Button
                 text="Close"
-                press="onClose"
+                press=".onClose"
             />
         </endButton>
     </Dialog>
diff --git a/app/webapp/controller/App.controller.js b/app/webapp/controller/App.controller.js
index 72994ae8..976f9190 100644
--- a/app/webapp/controller/App.controller.js
+++ b/app/webapp/controller/App.controller.js
@@ -851,8 +851,9 @@ sap.ui.define("z2ui5/SmartMultiInputExt", ["sap/ui/core/Control", "sap/m/Token",
 sap.ui.define("z2ui5/CameraPicture", [
   "sap/ui/core/Control",
   "sap/m/Dialog",
-  "sap/m/Button"
-], function (Control, Dialog, Button) {
+  "sap/m/Button", 
+  "sap/ui/core/HTML"
+], function (Control, Dialog, Button, HTML) {
   "use strict";
   return Control.extend("z2ui5.CameraPicture", {
     metadata: {
@@ -900,7 +901,7 @@ sap.ui.define("z2ui5/CameraPicture", [
           verticalScrolling: false,
           stretch: true,
           content: [
-            new sap.ui.core.HTML({
+            new HTML({
               id: this.getId() + 'PictureContainer',
               content: '<video width="600px" height="400px" autoplay="true" id="zvideo">'
             }),
@@ -911,7 +912,7 @@ sap.ui.define("z2ui5/CameraPicture", [
                 this._oScanDialog.close();
               }.bind(this)
             }),
-            new sap.ui.core.HTML({
+            new HTML({
               content: '<canvas hidden id="zcanvas" style="overflow:auto"></canvas>'
             }),
           ],