Replay support (#17). Fixing nullable warnings.