Metadata migration fix