Fixing some errors in replay and bringing it in line with CFF.