Final fix to badges