Bunch of BB10 changes I did some months ago. Didn't really look at them again.