Various improvements to charms