fixed annotations & fixes according to synchronizer changes
6 files changed