Fixes and synchronization