Some changes to try to fix connection issues on mobile data