More fixes for the badges