Fixes to badge