hotplug fixes