Fixes on sync