Upgrade/fix/sketchy mobile