WLAN fixes from ejtagle