Sync improvements

A few minor changes to reduce unnecessary API hits. Details in commit messages.