Fixing some issues with mobile