Cleanup and bugfixes for skel replay