[PermanentTimeShift] some small fixes to help History Zap.