couple of tweaks for hotspot mode work-arounds