Fixup idempotency