Badges fixed