More fixes for mobile.