Two small fixes and a silly badge