Add autojoin back
Make sure we don't auto-load HexTray