A few chatplus tweaks