More replay tweaks