BlackBerry fixes