Enhance TimeMachine transitions & fixes