Couple of mobile fixes