More fixes to mobile