Fixes to badges