fixes to hotspot creation