Small fixes in replay attacks