diff --git a/source/Ox.UI/js/Form/Ox.Button.js b/source/Ox.UI/js/Form/Ox.Button.js
index 797f101f..70b335f9 100644
--- a/source/Ox.UI/js/Form/Ox.Button.js
+++ b/source/Ox.UI/js/Form/Ox.Button.js
@@ -131,7 +131,7 @@ Ox.Button = function(options, self) {
             }
             that.triggerEvent('change');
         } else if (key == 'tooltip') {
-
+            that.$tooltip.options({title: value});
         } else if (key == 'title') {
             setTitle(value);
         } else if (key == 'width') {
diff --git a/source/Ox.UI/js/Video/Ox.VideoPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPlayer.js
index 90be76f2..e3085e3d 100644
--- a/source/Ox.UI/js/Video/Ox.VideoPlayer.js
+++ b/source/Ox.UI/js/Video/Ox.VideoPlayer.js
@@ -2126,6 +2126,9 @@ Ox.VideoPlayer = function(options, self) {
     }
 
     function togglePaused(from) {
+        if (!self.loadedMetadata) {
+            return;
+        }
         self.options.paused = !self.options.paused;
         self.$timeline && self.$timeline.options({
             paused: self.options.paused