Sync field def fixes