Extra stability fixes and improvements to WiFi ES