Changes to hopefully fix tethering.