Add missing pieces for advanced reboot