Fixes few replay stuffs