Added temporary patches to avoid poweroff crash