Tweaks to badges fork