Make auto-host easier