- Final badge fix