Backend Sync fixes