Badge tweaks