Badge Number fixes

Merge of badge number fixes from staging