Couple of trival changes before the hotplug stuff.