Couple of small fixes and a badge