Fill right header fields
Cleanup syncer