Further improvements for mobile.