Some Chat tweaks