MSM hotplug tweaks by neobuddy