auto_hotplug: various tweaks