More idempotency fixes
Fix idempotency