More badge fixing