SSI Fixes, Hotspot initial structure