Badges fixes