Fixup metadata bugs.