Some further fixes in sync process.