Several changes to get the BB10 UI integration