Fix badges and email URLs