Some charge and link tweaks