Badge issuing fixes