diff --git a/source/Ox.UI/js/Calendar/Calendar.js b/source/Ox.UI/js/Calendar/Calendar.js
index 8be40977..598f4e85 100644
--- a/source/Ox.UI/js/Calendar/Calendar.js
+++ b/source/Ox.UI/js/Calendar/Calendar.js
@@ -603,7 +603,7 @@ Ox.Calendar = function(options, self) {
     function dragstart(data) {
         //if ($(e.target).is(':not(.OxLine > .OxEvent)')) {
             self.drag = {
-                top: self.$container.$element[0].scrollTop,
+                top: self.$container[0].scrollTop,
                 x: data.clientX
             };
         //}
@@ -1150,14 +1150,14 @@ Ox.Calendar = function(options, self) {
 
     function scrollBy(delta) {
         scrollTo(
-            self.$container.$element[0].scrollTop
+            self.$container[0].scrollTop
             + delta * Math.round(self.$container.height() / 2), true
         );
     }
 
     function scrollTo(top, animate) {
         var containerHeight = self.$container.height(),
-            scrollTop = self.$container.$element[0].scrollTop,
+            scrollTop = self.$container[0].scrollTop,
             min = 0,
             max = self.contentHeight - containerHeight,
             top = Ox.limit(top, min, max),
@@ -1168,7 +1168,7 @@ Ox.Calendar = function(options, self) {
                 scrollTop: top
             }, ms);
         } else {
-            self.$container.$element[0].scrollTop = top;
+            self.$container[0].scrollTop = top;
         }
     }
 
diff --git a/source/Ox.UI/js/Core/GarbageCollection.js b/source/Ox.UI/js/Core/GarbageCollection.js
index f11f6c48..0d10f72a 100644
--- a/source/Ox.UI/js/Core/GarbageCollection.js
+++ b/source/Ox.UI/js/Core/GarbageCollection.js
@@ -35,8 +35,8 @@ Ox.GarbageCollection = (function() {
     @*/
     that.debug = function() {
         var classNames = {}, sorted = [];
-        Ox.forEach(Ox.UI.elements, function(element, id) {
-            var className = element.$element[0].className;
+        Ox.forEach(Ox.UI.elements, function($element, id) {
+            var className = $element[0].className;
             classNames[className] = (classNames[className] || 0) + 1;
         });
         Ox.forEach(classNames, function(count, className) {
diff --git a/source/Ox.UI/js/Map/Map.js b/source/Ox.UI/js/Map/Map.js
index 185fd7de..5abc091e 100644
--- a/source/Ox.UI/js/Map/Map.js
+++ b/source/Ox.UI/js/Map/Map.js
@@ -860,7 +860,7 @@ Ox.Map = function(options, self) {
 
             self.center = mapBounds ? mapBounds.getCenter() : new google.maps.LatLng(0, 0);
             self.zoom = self.minZoom;
-            that.map = self.map = new google.maps.Map(self.$map.$element[0], {
+            that.map = self.map = new google.maps.Map(self.$map[0], {
                 center: self.center,
                 disableDefaultUI: true,
                 disableDoubleClickZoom: true,
diff --git a/source/Ox.UI/js/Video/VideoEditorPlayer.js b/source/Ox.UI/js/Video/VideoEditorPlayer.js
index 0d369602..f3230989 100644
--- a/source/Ox.UI/js/Video/VideoEditorPlayer.js
+++ b/source/Ox.UI/js/Video/VideoEditorPlayer.js
@@ -58,7 +58,7 @@ Ox.VideoEditorPlayer = function(options, self) {
                 playing: playing
             })
             .appendTo(that);
-        self.video = self.$video.$element[0];
+        self.video = self.$video[0];
     } else {
         self.$video = $('<img>')
             .css({