Fixed all reboot isues