Minor sync changes

Some minor changes requested by @dae