replay fixes