Fix Wi-Fi tether + use remote file
Sync with remote changes