[PermanentTimeShift] some small fixes for exiting timeshift.