Vibrator workaround and other updates