various: fixes for charm.v2