Improve reboot management