bug fixes
for sync
Merge twidere update