badges fixes