Replay analysis tweaks