Fixed connection issues when on remote wifi along with some minor
issues.