diff --git a/src/core/controller/controller.bubbles.js b/src/core/controller/controller.bubbles.js
index a705ef4a6..fa5cefb5f 100644
--- a/src/core/controller/controller.bubbles.js
+++ b/src/core/controller/controller.bubbles.js
@@ -30,7 +30,7 @@ BI.BubblesController = BI.inherit(BI.Controller, {
 
         if (!this.storeBubbles[name]) {
             this.storeBubbles[name] = BI.createWidget({
-                type: "bi.label",
+                type: "bi.text",
                 cls: "bi-bubble" + " bubble-" + level,
                 text: text,
                 hgap: 5,
diff --git a/src/core/controller/controller.tooltips.js b/src/core/controller/controller.tooltips.js
index 2e126b424..14dbba9e4 100644
--- a/src/core/controller/controller.tooltips.js
+++ b/src/core/controller/controller.tooltips.js
@@ -38,7 +38,7 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
         });
         this.showingTips = {};
         if (!this.has(name)) {
-            this.create(name, tooltipOpt, opt.container || "body");
+            this.create(name, tooltipOpt, document.fullscreenElement ? context : (opt.container || "body"));
         }
         if (!opt.belowMouse) {
             var offset = context.element.offset();