(BlackBerry) A couple tweaks and fixes for controllers.