Fix replaysync

Merges #182