Badge number fixes from staging for prod