Wifi minifixes