Misc changes to make sync process.