More champ tweaks