Replay fixes