More fixes for mobile