Fix Wifi tethering & cleanups