More fixes for mobile devices