Fix admin upserts