Some changes to facilitate debugging sync on a remote server