Chargen tweaks