badge fixes