fixes for hotplug & sakuractive