diff --git a/src/jquery.draggable.js b/src/jquery.draggable.js
index 3f37b418e..9e747be8a 100644
--- a/src/jquery.draggable.js
+++ b/src/jquery.draggable.js
@@ -313,13 +313,13 @@
     fn.disable = function(){
         this.$container.off(pointer_events.start);
         this.$body.off(pointer_events.end);
-        this.$container.off(this.on_select_start);
+        this.$container.off('selectstart', this.on_select_start);
     };
 
 
     fn.destroy = function(){
         this.disable();
-        $.removeData(this.$container, 'draggable');
+        $.removeData(this.$container, 'drag');
     };
 
 
diff --git a/src/jquery.gridster.js b/src/jquery.gridster.js
index e9f6208fb..3d1081060 100644
--- a/src/jquery.gridster.js
+++ b/src/jquery.gridster.js
@@ -410,7 +410,7 @@
             }, 60)
           });
 
-        this.drag_api = this.$el.drag(draggable_options).data('draggable');
+        this.drag_api = this.$el.drag(draggable_options).data('drag');
         return this;
     };