Fix two bugs in the new idempotent catalog updates.