Improve boot sequence (might help hotplugging?)