Fix syncing bugs
Definitions