Fixing a couple of bugs with replay