Badge fixes