Polish many small details related to EN sync flow