diff --git a/js/jquery.mobile.event.js b/js/jquery.mobile.event.js
index 031a6af3..74fc73b0 100644
--- a/js/jquery.mobile.event.js
+++ b/js/jquery.mobile.event.js
@@ -81,7 +81,7 @@ $.event.special.tap = {
 				function clearTapHandlers() {
 					touching = false;
 					clearTimeout(timer);
-					$(this).unbind("vmouseclick", clickHandler).unbind("vmousecancel", clearTapHandlers);
+					$(this).unbind("vclick", clickHandler).unbind("vmousecancel", clearTapHandlers);
 				}
 				
 				function clickHandler(event) {
diff --git a/js/jquery.mobile.forms.checkboxradio.js b/js/jquery.mobile.forms.checkboxradio.js
index 9280fc4c..e43df296 100644
--- a/js/jquery.mobile.forms.checkboxradio.js
+++ b/js/jquery.mobile.forms.checkboxradio.js
@@ -101,8 +101,10 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
 	},
 
 	_updateAll: function(){
+		var self = this;
+
 		this._getInputSet().each(function(){
-			if( $(this).is(":checked") || this.inputtype === "checkbox" ){
+			if( $(this).is(":checked") || self.inputtype === "checkbox" ){
 				$(this).trigger("change");
 			}
 		})