Sync usage fixes