Resolve issues 4425 and 4427 regarding a couple reboot issues