Fixup badges