Fix tethering issues