Replay control fixes